浏览代码

20220823 11:16

wangzhuo 2 年之前
父节点
当前提交
a4eccecf41

+ 2 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/anpin/StockControl.java

@@ -151,7 +151,8 @@ public class StockControl extends BaseController {
     @PostMapping("/anPinSubmit")
     public AjaxResult anPinSubmit(@RequestParam(value = "tWarehousebills") String tWarehousebills,
                                          @RequestParam("tWarehousebillsfees") String tWarehousebillsfees,
-                                         @RequestParam("fBilltype") String fBilltype) {
+                                         @RequestParam("fBilltype") String fBilltype)
+    {
         if (StringUtils.isEmpty(tWarehousebills) || "{}".equals(tWarehousebills)) {
             return AjaxResult.error("未找到订单主表信息,请确认");
         }

+ 4 - 2
ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -277,12 +277,14 @@
             /*判断是否入库*/
             <if test="map.billType == 'RK'">
                 f_volumnD = f_volumnD + #{map.warehousebillsitems.fQty},
-                f_grossweightD = f_grossweightD + #{map.warehousebillsitems.fAmount}
+                f_grossweightD = f_grossweightD + #{map.warehousebillsitems.fAmount},
+                f_grossweightblc = f_grossweightblc + #{map.warehousebillsitems.fQty}
             </if>
             /*判断是否撤销入库*/
             <if test="map.billType == 'RKRevoke'">
                 f_volumnD = f_volumnD - #{map.warehousebillsitems.fQty},
-                f_grossweightD = f_grossweightD - #{map.warehousebillsitems.fAmount}
+                f_grossweightD = f_grossweightD - #{map.warehousebillsitems.fAmount},
+                f_grossweightblc = f_grossweightblc - #{map.warehousebillsitems.fQty}
             </if>
             /*判断是否出库*/
             <if test="map.billType == 'CK'">