提交 发货单、入库根据箱号进行分组修改

guoyujie

2025-08-18 4b14bee53a324976085d59708baed878099023a1

提交 发货单、入库根据箱号进行分组修改

 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyang.vue

@@ -213,7 +213,7 @@

<template>
  <div >
    <div v-for="(page,pageIndex) in pageData" class="content1">
    <div v-for="(page,pageIndex) in pageData" class="content1" >
      <table>
        <thead>
        <tr style="height: 3.6cm"><td></td></tr>
@@ -311,7 +311,7 @@
        </tr>
        </tbody>
      </table>
      <table class="foot">
      <table class="foot" >
        <tr >
          <td style="width: 5cm"></td>
          <td  style="width: 150px" ></td>
@@ -330,6 +330,7 @@
                :value="getMoneySum(pageIndex)"
                style="font-size: 17px;border: 0;width: 100%"/>
          </td>
          <td></td>
        </tr>
        <tr style="height: 0.65cm"><td></td></tr>
        <tr>

 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyangDetails.vue

@@ -319,7 +319,7 @@

              <el-col :span="5" style="font-size: 16px;white-space: nowrap;">
                <input v-model="delivery.project"
                       style="border: 0;width: 100%;
                       style="border: 0;width: 250%;
                         height: 100%;font-size:16px;white-space: nowrap; "/>
              </el-col>
            </el-row>

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java

@@ -86,7 +86,7 @@
    Boolean updateDeliveryDeliveryState(String deliveryId,Integer state);

    Boolean updateDeliveryDetailState(@Param("orderId") String orderId,
                                      @Param("orderNumber") Integer orderNumber,@Param("deliveryId") String deliveryId,Integer state);
                                      @Param("orderNumber") Integer orderNumber, @Param("deliveryId") String deliveryId, Integer state, String remarks);

    Boolean insertFinishedGoodsInventory(@Param("flowCard") FlowCard flowCard,
                                         @Param("storageRegion") String storageRegion,
@@ -129,8 +129,8 @@
                                        @Param("orderNumber") Integer orderNumber,
                                        @Param("quantity") Integer quantity, String boxNo);
    Boolean updateInventoryInventoryInt(@Param("orderId") String orderId,
                                               @Param("orderNumber") Integer orderNumber,
                                               @Param("quantity") Integer quantity);
                                        @Param("orderNumber") Integer orderNumber,
                                        @Param("quantity") Integer quantity, String remarks);

    List<OrderDetail> getSelectOrderDetail(String orderId);

@@ -141,7 +141,7 @@
    FlowCard findFlowCard(FlowCard flowCard);

    DeliveryDetail findDeliverydetail(@Param("orderId") String orderId,
                                      @Param("orderNumber") Integer orderNumber,@Param("deliveryId") String deliveryId);
                                      @Param("orderNumber") Integer orderNumber, @Param("deliveryId") String deliveryId, String boxNo);


    Integer findOrderNumberdContainercount(String orderId, Integer orderNumber, String container);

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java

@@ -1,7 +1,6 @@
package com.example.erp.mapper.mm;

import com.example.erp.dto.mm.FinishedOperateLogDTO;
import com.example.erp.entity.mm.FinishedGoodsInventory;
import com.example.erp.entity.mm.FinishedOperateLog;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.OrderDetail;
@@ -21,7 +20,7 @@
                                        @Param("oddNumber") String oddNumber,@Param("container") String container,
                                        @Param("deliveryDetailMoney") Double deliveryDetailMoney,@Param("deliveryDetailArea") Double deliveryDetailArea);

    Boolean insertOutFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);
    Boolean insertOutFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail, @Param("userName") String userName, @Param("oddNumber") String oddNumber, String boxNo);

    Boolean insertFinishedOperateLogAllocate(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);


 north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java

@@ -560,7 +560,7 @@
                        //审核修改领出记录
                        finishedOperateLogMapper.updateToExamine(finishedOperateLog,userName,"未审核");
                        //审核修改库存数量
                        finishedGoodsInventoryMapper.updateInventoryInventoryInt(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),Math.toIntExact(finishedOperateLog.getQuantity()));
                        finishedGoodsInventoryMapper.updateInventoryInventoryInt(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),Math.toIntExact(finishedOperateLog.getQuantity()), finishedOperateLog.getRemarks());
                        log.setFunction("updateFinishedGoodsInventoryToExamine反审");
                    }

@@ -901,21 +901,33 @@
            String oddNumber= orderNumberSetting("出库");
            OrderDetail orderDetailNew= finishedGoodsInventoryMapper.findOrderDetailNumberd(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber());
            //添加出入库记录
            finishedOperateLogMapper.insertOutFinishedOperateLog(orderDetail,userName,oddNumber);
            finishedOperateLogMapper.insertOutFinishedOperateLog(orderDetail,userName,oddNumber,orderDetail.getDeliveryDetail().getBoxNo());

            //判断发货单的库存是否存在
            Integer finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdcount(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber(),orderDetail.getDeliveryDetail().getBoxNo());


            //获取订单总数量
            Integer ordersum = finishedGoodsInventoryMapper.findOrderQuantity(orderDetail.getDeliveryDetail().getOrderId());
            //获取库存总数量
            Integer orderNumberdsum = finishedGoodsInventoryMapper.findOrderNumberdsum(orderDetail.getDeliveryDetail().getOrderId());
            //获取发货总数量
            Integer orderNumberdDeliverysum = finishedGoodsInventoryMapper.findOrderDeliveryQuantitySum(orderDetail.getDeliveryDetail().getOrderId());

            //获取此发货单 发货总数量
            Integer deliverysum = finishedGoodsInventoryMapper.findDeliveryQuantity(orderDetail.getDeliveryDetail().getDeliveryId());
            //获取已经出库的数量
            Integer deliverydetailsum = finishedGoodsInventoryMapper.findDeliverydetailsum(orderDetail.getDeliveryDetail().getDeliveryId(),0);
            if(deliverydetailsum==null){
                deliverydetailsum=0;
            }

            DeliveryDetail deliveryDetail=finishedGoodsInventoryMapper.findDeliverydetail(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber(),orderDetail.getDeliveryDetail().getDeliveryId());
            DeliveryDetail deliveryDetail=finishedGoodsInventoryMapper.
                    findDeliverydetail(orderDetail.getDeliveryDetail().getOrderId(),
                            orderDetail.getDeliveryDetail().getOrderNumber(),
                            orderDetail.getDeliveryDetail().getDeliveryId(),
                            orderDetail.getDeliveryDetail().getBoxNo()

                    );
                    /*System.out.println("订单总数:" + ordersum + "订单库存数：" + orderNumberdsum + "准备出库数量" +
                            orderDetail.getWarehouseNum()+ "发货数量" + orderDetail.getDeliveryDetail().getQuantity()+ "发货总数" +
                            deliverysum+ "已发数量" + deliverydetailsum);*/
@@ -927,7 +939,7 @@
                        //修改库存表库存数量
                        finishedGoodsInventoryMapper.updateInventoryInventoryOut(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber(),orderDetail.getDeliveryDetail().getQuantity(),orderDetail.getDeliveryDetail().getBoxNo());
                        //修改发货明细表状态
                        finishedGoodsInventoryMapper.updateDeliveryDetailState(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber(),orderDetail.getDeliveryDetail().getDeliveryId(),0);
                        finishedGoodsInventoryMapper.updateDeliveryDetailState(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber(),orderDetail.getDeliveryDetail().getDeliveryId(),0, orderDetail.getDeliveryDetail().getBoxNo());
                        //修改发货表状态
                        finishedGoodsInventoryMapper.updateDeliveryDeliveryState(orderDetail.getDeliveryDetail().getDeliveryId(),1);
                        //修改订单明细表发货数量
@@ -1003,9 +1015,19 @@
                //修改记录表
                finishedOperateLogMapper.updateFinishedOperateLogState(finishedOperateLog,"已作废");
                //修改库存表库存数量
                finishedGoodsInventoryMapper.updateInventoryInventoryInt(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),finishedOperateLog.getQuantity());
                finishedGoodsInventoryMapper.updateInventoryInventoryInt(
                        finishedOperateLog.getOrderId(),
                        finishedOperateLog.getOperationNumber(),
                        finishedOperateLog.getQuantity(),
                        finishedOperateLog.getRemarks()
                );
                //修改发货明细表状态
                finishedGoodsInventoryMapper.updateDeliveryDetailState(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),finishedOperateLog.getOperationOrderNumber(),1);
                finishedGoodsInventoryMapper.updateDeliveryDetailState(
                        finishedOperateLog.getOrderId(),
                        finishedOperateLog.getOperationNumber(),
                        finishedOperateLog.getOperationOrderNumber(),
                        1,
                        finishedOperateLog.getRemarks());
                //修改发货表状态
                finishedGoodsInventoryMapper.updateDeliveryDeliveryState(finishedOperateLog.getOperationOrderNumber(),1);
                //修改订单明细表库内数量

 north-glass-erp/src/main/resources/application.yml

@@ -4,7 +4,7 @@
server:
  port: 8086

ip: 10.153.19.227
ip: localhost
port: 3306

#sa-token:

 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml

@@ -158,13 +158,13 @@
    <update id="updateInventoryInventoryInt">
        update mm.finished_goods_inventory
        set inventory=inventory+#{quantity}
        where order_number=#{orderNumber}  and order_id=#{orderId}
        where order_number=#{orderNumber}  and order_id=#{orderId} and trim(box_no) = trim(#{remarks})
    </update>

    <update id="updateInventoryInventoryOut">
        update mm.finished_goods_inventory
        set inventory=inventory-#{quantity}
        where order_number=#{orderNumber}  and order_id=#{orderId}
        where order_number=#{orderNumber}  and order_id=#{orderId} and trim(box_no) = trim(#{boxNo})
    </update>

    <select id="getSelectAllocate"  resultMap="selectDeliveryFinishedGoodsInventory">
@@ -288,7 +288,7 @@
    <update id="updateDeliveryDetailState">
        update sd.delivery_detail
        set delivery_detail_state=#{state}
        where order_number=#{orderNumber}  and order_id=#{orderId} and delivery_id=#{deliveryId}
        where order_number=#{orderNumber}  and order_id=#{orderId} and delivery_id=#{deliveryId} and trim(box_no) = trim(#{remarks})
    </update>

    <update id="updateInventoryquantityavailable">
@@ -537,6 +537,7 @@
        set inventory=inventory-${finishedOperateLog.quantity},quantity_available=quantity_available-${finishedOperateLog.quantity},
        update_time=now(),area=actual_signal_area*quantity_available
        where order_number=#{finishedOperateLog.operationNumber}  and order_id=#{finishedOperateLog.orderId}
        and box_no=#{finishedOperateLog.remarks}
    </update>

    <insert id="insertFinishedGoodsInventory"  useGeneratedKeys="true"  >
@@ -1025,7 +1026,11 @@

    <select id="findDeliverydetail">
        select * from sd.delivery_detail
        where order_number=#{orderNumber}  and order_id=#{orderId} and delivery_id=#{deliveryId} and delivery_detail_state=0
        where order_number=#{orderNumber}
          and order_id=#{orderId}
          and delivery_id=#{deliveryId}
          and delivery_detail_state=0
        and trim(#{boxNo}) =box_no
    </select>

    <select id="getSelectDeliveryDetailDeliveryId"  resultMap="selectDelivery">

 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml

@@ -633,11 +633,12 @@
                                            operator,
                                            quantity,
                                            operate_time,
                                            status
                                            status,
                                            remarks
        )
        values (
                   #{orderDetail.deliveryDetail.deliveryId} ,#{orderDetail.deliveryDetail.orderId},#{orderDetail.deliveryDetail.orderNumber}
                   ,"出库",#{userName},#{orderDetail.deliveryDetail.quantity},now(),"未审核"
                   ,"出库",#{userName},#{orderDetail.deliveryDetail.quantity},now(),"未审核",#{boxNo}
               )
    </insert>