Merge remote-tracking branch 'origin/master'

src/main/java/com/dk/mdm/controller/FileController.java

@@ -76,26 +76,27 @@ public class FileController {
             if ("mp4".equals(fileType) || "avi".equals(fileType) || "mov".equals(fileType)) {
                 return "video";
             }
-            // 小程序
-            if (Constant.AppCode.WEIXIN.getCode().equals(appCode)) {
+            // 网页端
+            if (Constant.AppCode.WEB.getCode().equals(appCode)) {
+
                 if ("xls".equals(fileType) || "xlsx".equals(fileType)) {
-                    return "file";
+                    return "excel";
                 }
                 if ("pdf".equals(fileType)) {
-                    return "file";
+                    return "pdf";
                 }
                 if ("jpg".equals(fileType) || "jepg".equals(fileType) || "png".equals(fileType)) {
-                    return "image";
+                    return "img";
                 }
             } else {
                 if ("xls".equals(fileType) || "xlsx".equals(fileType)) {
-                    return "excel";
+                    return "file";
                 }
                 if ("pdf".equals(fileType)) {
-                    return "pdf";
+                    return "file";
                 }
                 if ("jpg".equals(fileType) || "jepg".equals(fileType) || "png".equals(fileType)) {
-                    return "img";
+                    return "image";
                 }
             }
         }

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

@@ -596,7 +596,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                sys.f_remove_zero(t.outing_qty + t.out_qty)                                                              as outing_qty,
                t.outing_amt + t.out_amt                                                              as outing_amt,
                t.non_std_code,
-               t.remarks
+               t.remarks,
                tmgu.decimal_places    as "decimalPlaces",
                tmgus.unit_name         as "subUnitName",
                tmgu.unit_name         as "unitName" ,
@@ -654,17 +654,17 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                sys.f_remove_zero(t.out_qty) as out_qty,
                t.out_amt,
             t.non_std_code,
-               t.remarks
-                ,tmgu.decimal_places    as "decimalPlaces"
-                ,tmgus.unit_name         as "subUnitName"
-                ,tmgu.unit_name         as "unitName"
-                ,t.pack_box
-                ,tmgs.flg_sub_unit       as "flgSubUnit"
-                ,t.outing_box
-                ,t.outing_piece
-                ,t.out_box
-                ,t.out_piece
-        ,t.out_status
+               t.remarks,
+               tmgu.decimal_places    as "decimalPlaces",
+                tmgus.unit_name         as "subUnitName",
+                tmgu.unit_name         as "unitName",
+                t.pack_box,
+                tmgs.flg_sub_unit       as "flgSubUnit",
+                t.outing_box,
+                t.outing_piece,
+                t.out_box,
+                t.out_piece,
+                t.out_status
         FROM dkic_b.t_psi_outbound_item as t
                  left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = t.wh_id
                  left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = t.sku_id

src/main/java/com/dk/mdm/service/ivt/inventory/InventoryService.java

@@ -1370,11 +1370,7 @@ public class InventoryService extends BaseService<Inventory> {
         //endregion
 
         //region 库存数量重算   库存数量-删除数量
-        BigDecimal qty = inOutRecordVO.getQtyBeforeUpdate() != null && inOutRecordVO.getQtyBeforeUpdate().compareTo(BigDecimal.ZERO) > 0 ? inOutRecordVO.getQtyBeforeUpdate() : inOutRecordVO.getIntoQty();
-        // 销售退货的编辑量不对 周兴 2024-7-13 修改 这里的qty 应该是差值 TODO
-//        if (Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) {
-//            qty = inOutRecordVO.getQtyBeforeUpdate() != null ? (inOutRecordVO.getQtyBeforeUpdate().subtract(inOutRecordVO.getIntoQty())) : inOutRecordVO.getIntoQty();
-//        }
+        BigDecimal qty = inOutRecordVO.getQtyBeforeUpdate() != null ? inOutRecordVO.getQtyBeforeUpdate() : inOutRecordVO.getIntoQty();
         Inventory inventory = new Inventory();
         //库存id
         inventory.setInvId(inventoryResponse.getInvId());

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleReturnService.java

@@ -146,8 +146,8 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
             }
             Outbound outboundPri = new Outbound();
             outboundPri.setOutId(str);
-            outboundPri.setReturnQty( outboundResponse.getReturnQty().subtract( (returnSumQty.add(returnIngSumQty)).negate() ).abs() );
-            outboundPri.setReturnAmt( outboundResponse.getReturnAmt().subtract( (returnSumAmt.add(returnIngSumAmt)).negate() ).abs() );
+            outboundPri.setReturnQty(outboundResponse.getReturnQty().add((returnSumQty.add(returnIngSumQty))).negate());
+            outboundPri.setReturnAmt(outboundResponse.getReturnAmt().add((returnSumAmt.add(returnIngSumAmt))).negate());
             outboundMapper.updateReturnMessage(outboundPri);
         }
         //endregion
@@ -174,8 +174,8 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
             }
             Order orderPri = new Order();
             orderPri.setOrderId(str);
-            orderPri.setReturnQty( orderResponse.getReturnQty().subtract( (returnSumQty.add(returnIngSumQty)).negate() ).abs() ) ;
-            orderPri.setReturnAmt( orderResponse.getReturnAmt().subtract( (returnSumAmt.add(returnIngSumAmt)).negate() ).abs() );
+            orderPri.setReturnQty(orderResponse.getReturnQty().add((returnSumQty.add(returnIngSumQty))).negate());
+            orderPri.setReturnAmt(orderResponse.getReturnAmt().add((returnSumAmt.add(returnIngSumAmt))).negate());
             orderMapper.updateReturnMessage(orderPri);
         }
         //endregion
@@ -183,14 +183,13 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
 
     /**
      * @desc : 修改原明细（订单，出库）
-     * posNegFlag :正负标识  true:正数，false:负数
      * isOutEdit：取入库中还是已入库数量  true 取已入库  false 取 入库中
      * 默认传值过来的是负数
      * @date : 2024/3/29 10:46
      * @author : 寇珊珊
      */
     @Transactional(rollbackFor = {Exception.class})
-    public void updatePrimaryDetail(OutboundItemVO outboundItemVO, Boolean posNegFlag, Boolean isOutEdit) {
+    public void updatePrimaryDetail(OutboundItemVO outboundItemVO, Boolean isOutEdit) {
         //region  反写出库明细
         if (outboundItemVO.getSOutItemId() != null) {
             OutboundItemResponse outboundItemResponse = outboundItemMapper.selectById(outboundItemVO.getSOutItemId());
@@ -203,13 +202,8 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
             //region  赋值修改
             OutboundItem outboundItemPri = new OutboundItem();
             outboundItemPri.setItemId(outboundItemVO.getSOutItemId());
-            if (posNegFlag) {
-                outboundItemPri.setReturnQty(isOutEdit ? outboundItemResponse.getReturnQty().subtract(outboundItemVO.getOutQty().negate()).abs() : outboundItemResponse.getReturnQty().subtract(outboundItemVO.getOutingQty().negate()).abs());
-                outboundItemPri.setReturnAmt(isOutEdit ? outboundItemResponse.getReturnAmt().subtract(outboundItemVO.getOutAmt().negate()).abs() : outboundItemResponse.getReturnAmt().subtract(outboundItemVO.getOutingAmt().negate()).abs());
-            } else {
-                outboundItemPri.setReturnQty(isOutEdit ? outboundItemResponse.getReturnQty().subtract(outboundItemVO.getOutQty()).abs() : outboundItemResponse.getReturnQty().subtract(outboundItemVO.getOutingQty()).abs());
-                outboundItemPri.setReturnAmt(isOutEdit ? outboundItemResponse.getReturnAmt().subtract(outboundItemVO.getOutAmt()).abs() : outboundItemResponse.getReturnAmt().subtract(outboundItemVO.getOutingAmt()).abs());
-            }
+            outboundItemPri.setReturnQty(isOutEdit ? outboundItemResponse.getReturnQty().add(outboundItemVO.getOutQty()).negate() : outboundItemResponse.getReturnQty().add(outboundItemVO.getOutingQty()).negate());
+            outboundItemPri.setReturnAmt(isOutEdit ? outboundItemResponse.getReturnAmt().add(outboundItemVO.getOutAmt()).negate() : outboundItemResponse.getReturnAmt().add(outboundItemVO.getOutingAmt()).negate());
             outboundItemMapper.updateReturnMessage(outboundItemPri);
             //endregion
         }
@@ -228,13 +222,8 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
             //region  赋值修改
             OrderItem orderItem = new OrderItem();
             orderItem.setItemId(outboundItemVO.getSOrderItemId());
-            if (posNegFlag) {
-                orderItem.setReturnQty(isOutEdit ? orderItemResponse.getReturnQty().subtract(outboundItemVO.getOutQty().negate()).abs() : orderItemResponse.getReturnQty().subtract(outboundItemVO.getOutingQty().negate()).abs() );
-                orderItem.setReturnAmt(isOutEdit ? orderItemResponse.getReturnAmt().subtract(outboundItemVO.getOutAmt().negate()).abs() : orderItemResponse.getReturnAmt().subtract(outboundItemVO.getOutingAmt().negate()).abs() );
-            } else {
-                orderItem.setReturnQty(isOutEdit ? orderItemResponse.getReturnQty().subtract(outboundItemVO.getOutQty()).abs(): orderItemResponse.getReturnQty().subtract(outboundItemVO.getOutingQty()).abs() );
-                orderItem.setReturnAmt(isOutEdit ? orderItemResponse.getReturnAmt().subtract(outboundItemVO.getOutAmt()).abs() : orderItemResponse.getReturnAmt().subtract(outboundItemVO.getOutingAmt()).abs());
-            }
+            orderItem.setReturnQty(isOutEdit ? orderItemResponse.getReturnQty().add(outboundItemVO.getOutQty()).negate() : orderItemResponse.getReturnQty().add(outboundItemVO.getOutingQty()).negate());
+            orderItem.setReturnAmt(isOutEdit ? orderItemResponse.getReturnAmt().add(outboundItemVO.getOutAmt()).negate() : orderItemResponse.getReturnAmt().add(outboundItemVO.getOutingAmt()).negate());
             orderItemMapper.updateReturnMessage(orderItem);
             //endregion
         }
@@ -428,7 +417,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
             outboundVO = outCommon.insertCustomer(outboundVO);
         }
         //更新总单客户状态为成交
-        customerService.update(new CustomerVO().setCusId(outboundVO.getCusId()).setSaleStatus(Constant.SaleStatus.CHENGJIAO.getName()) );
+        customerService.update(new CustomerVO().setCusId(outboundVO.getCusId()).setSaleStatus(Constant.SaleStatus.CHENGJIAO.getName()));
 
         //endregion
 
@@ -511,7 +500,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                 ;
 
                 //region  反写出库明细 反写订单明细
-                this.updatePrimaryDetail(outboundItemVO, true, true);
+                this.updatePrimaryDetail(outboundItemVO, true);
                 //endregion
 
             } else {
@@ -520,7 +509,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                         .setOutAmt(BigDecimal.ZERO);
 
                 //region  反写出库明细 反写订单明细
-                this.updatePrimaryDetail(outboundItemVO, true, false);
+                this.updatePrimaryDetail(outboundItemVO, false);
                 //endregion
 
             }
@@ -677,7 +666,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                     //endregion
 
                     //region  反写出库明细 反写订单明细
-                    this.updatePrimaryDetail(outboundItemVO, true, true);
+                    this.updatePrimaryDetail(outboundItemVO, true);
                     //endregion
                 }
                 //endregion
@@ -790,7 +779,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                     //endregion
 
                     //region  反写出库明细 反写订单明细
-                    this.updatePrimaryDetail(outboundItemVO, true, false);
+                    this.updatePrimaryDetail(outboundItemVO, false);
                     //endregion
                 }
                 //endregion
@@ -1060,7 +1049,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
             //endregion
 
             //region  反写出库明细 反写订单明细
-            this.updatePrimaryDetail(outboundItemVO, true, true);
+            this.updatePrimaryDetail(outboundItemVO, true);
             //endregion
         }
         //endregion