发货显示入库的箱号

廖井涛

2025-06-27 3a712f9cb5e5789949d238d7fcc653424edcf0b6

发货显示入库的箱号

 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -320,6 +320,7 @@
    {field: 'select',type:'checkbox',title: t('basicData.check'), width: 80,fixed:"left"},
    {type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left"},
    {field: 'orderId',width:120,  title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'finishedGoodsInventory.boxNo',width:120,  title: t('箱号'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'productName',width:120,  title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'width',width:120,  title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'height',width:120,  title: t('order.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},

 north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java

@@ -26,7 +26,7 @@
    private LocalDate updateTime;
    private LocalDate endTime;
    private String processId;

    private String boxNo;
    private Order order;
    private OrderDetail orderDetail;


 north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java

@@ -24,6 +24,7 @@
    private String deliveryDetailRemakes;
    private Integer deliveryDetailState;
    private String otherColumns;
    private String boxNo;
    private LocalDate createTime;
    private LocalDate updateTime;
    private  Delivery delivery;

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

@@ -56,7 +56,7 @@

    Boolean updateInventory(@Param("flowCard") FlowCard flowCard,
                            @Param("storageRegion") String storageRegion,
                            @Param("remark") String remark);
                            @Param("remark") String remark, @Param("container") String container);

    Boolean updateInventoryOut(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);

@@ -89,7 +89,7 @@

    Boolean insertFinishedGoodsInventory(@Param("flowCard") FlowCard flowCard,
                                         @Param("storageRegion") String storageRegion,
                                         @Param("remark") String remark);
                                         @Param("remark") String remark, @Param("container") String container);


    List<OrderDetail> getSelectDeliveryDetail(@Param("offset") Integer offset,

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

@@ -119,7 +119,7 @@
                        /*System.out.println("订单总数:" + ordersum + "已入库数量：" + ordernumbersum + "准备入库数量" + flowCard.getInventoryQuantity());*/
                        if (finishedGoodsInventorycount > 0) {
                            //修改库存表入库数量
                            finishedGoodsInventoryMapper.updateInventory(flowCard,storageRegion, remark);
                            finishedGoodsInventoryMapper.updateInventory(flowCard,storageRegion, remark,container);
                            //修改流程卡表入库数量
                            finishedGoodsInventoryMapper.updateflowcard(flowCard);
                            //修改订单表入库状态
@@ -132,7 +132,7 @@
                                finishedGoodsInventoryMapper.updateOrderWarehousingState(flowCard.getOrder().getOrderId(),2);
                            }
                        } else {
                            if (finishedGoodsInventoryMapper.insertFinishedGoodsInventory(flowCard, storageRegion, remark)) {
                            if (finishedGoodsInventoryMapper.insertFinishedGoodsInventory(flowCard, storageRegion, remark,container)) {
                                //修改流程卡表入库数量
                                finishedGoodsInventoryMapper.updateflowcard(flowCard);
                                //修改订单明细表入库数量

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

@@ -503,6 +503,9 @@
        <if test="remark != null and remark != ''">
            , remark= #{remark}
        </if>
        <if test="container != null and container != ''">
            , box_no= #{container}
        </if>
        where order_number=#{flowCard.orderNumber}  and order_id=#{flowCard.order.orderId}
    </update>

@@ -525,6 +528,7 @@
                                                 storage_region,
                                                 `status`,
                                                 enter_storage_time,
                                                 box_no,
                                                 update_time,
                                                 end_time,
                                                 remark
@@ -533,7 +537,7 @@
                   #{flowCard.order.orderId} ,#{flowCard.orderNumber},#{flowCard.processId},#{flowCard.inventoryQuantity},ROUND(#{flowCard.orderDetail.width}*#{flowCard.orderDetail.height}/1000000,2),
                   ROUND(#{flowCard.orderDetail.width}*#{flowCard.orderDetail.height}*#{flowCard.inventoryQuantity}/1000000,2),
                #{flowCard.inventoryQuantity},null,#{storageRegion},
                0,now(),now(),null,#{remark}
                0,now(),#{container},now(),null,#{remark}
               )
    </insert>


 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml

@@ -53,6 +53,7 @@
        <result column="quantity_available" property="finishedGoodsInventory.quantityAvailable"/>
        <result column="storage_region" property="finishedGoodsInventory.storageRegion"/>
        <result column="actual_signal_area" property="finishedGoodsInventory.actualSignalArea"/>
        <result column="box_no" property="finishedGoodsInventory.boxNo"/>


    </resultMap>
@@ -160,11 +161,11 @@

    <insert id="insertDeliveryDetail"  useGeneratedKeys="true" >
        insert into sd.delivery_detail (delivery_id,delivery_number,order_number,
                                        area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time,price,other_money)
                                        area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time,price,other_money,box_no)
        values (
                   #{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{deliveryDetailArea},
                #{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
                #{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now(),#{orderDetail.price},#{otherMoneys}
                #{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now(),#{orderDetail.price},#{otherMoneys},#{orderDetail.finishedGoodsInventory.boxNo}
               )
    </insert>

@@ -189,6 +190,7 @@
               od.height,
               od.shape,
               fgi.actual_signal_area,
               dd.box_no,
               od.area,
               dd.area as gross_area,
               od.compute_area,
@@ -236,6 +238,9 @@
            </if>
            <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
                and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
            </if>
            <if test="orderDetail.deliveryDetail.boxNo != null and orderDetail.deliveryDetail.boxNo != ''">
                and dd.box_no regexp  #{orderDetail.deliveryDetail.boxNo}
            </if>
            <if test="orderDetail.deliveryDetail.money != null and orderDetail.deliveryDetail.money != ''">
                and dd.money regexp  REGEXP_REPLACE(#{orderDetail.deliveryDetail.money},'\\.0+$','')
@@ -320,6 +325,9 @@
            <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
                and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
            </if>
            <if test="orderDetail.deliveryDetail.boxNo != null and orderDetail.deliveryDetail.boxNo != ''">
                and dd.box_no regexp  #{orderDetail.deliveryDetail.boxNo}
            </if>
            <if test="orderDetail.deliveryDetail.money != null and orderDetail.deliveryDetail.money != ''">
                and dd.money regexp  REGEXP_REPLACE(#{orderDetail.deliveryDetail.money},'\\.0+$','')
            </if>
@@ -377,6 +385,7 @@
               od.height,
               od.shape,
               fgi.actual_signal_area,
               fgi.box_no,
               od.area,
               od.gross_area,
               od.compute_area,
@@ -420,6 +429,9 @@
            </if>
            <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
                and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
            </if>
            <if test="orderDetail.finishedGoodsInventory.boxNo != null and orderDetail.finishedGoodsInventory.boxNo != ''">
                and fgi.box_no regexp #{orderDetail.finishedGoodsInventory.boxNo}
            </if>
            <if test="orderDetail.width != null and orderDetail.width != ''">
                and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
@@ -493,6 +505,9 @@
            <if test="orderDetail.finishedGoodsInventory.storageRegion != null and orderDetail.finishedGoodsInventory.storageRegion != ''">
                and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
            </if>
            <if test="orderDetail.finishedGoodsInventory.boxNo != null and orderDetail.finishedGoodsInventory.boxNo != ''">
                and fgi.box_no regexp #{orderDetail.finishedGoodsInventory.boxNo}
            </if>
            <if test="orderDetail.width != null and orderDetail.width != ''">
                and od.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
            </if>