仓库app出入库确认修改

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -2712,13 +2712,15 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         warehouseBills.setUpdateBy(SecurityUtils.getUsername());
         Long timestamp = DateUtils.getTimestamp(new Date());
         warehouseBills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
-        TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(warehouseBills.getfId());
-        warehouseBills.setfQty(itemInFo.getfQty());
-        warehouseBills.setfNetweight(itemInFo.getfNetweight());
-        warehouseBills.setfGrossweight(itemInFo.getfGrossweight());
-        tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
         // 查询最新明细表
         TWarehousebillsitems warehousebillsitems = tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(tWarehousebillsitems.getfId());
+        Date time = new Date();
+        if (StringUtils.isNotEmpty(warehouseBills.getfChargetype()) && "0".equals(warehouseBills.getfChargetype())) {
+            time = tWarehousebillsitemsMapper.selecMinBsDateByFPid(tWarehousebillsitems.getfPid());
+        }else if (StringUtils.isNotEmpty(warehouseBills.getfChargetype()) && "1".equals(warehouseBills.getfChargetype())){
+            time = warehousebillsitems.getfBsdate();
+        }
+        tWarehousebillsitems.setfChargedate(time);
         if (StringUtils.isNull(warehousebillsitems) || warehousebillsitems.getfBillstatus() != 30L) {
             return AjaxResult.error("请确认是该明细数据是否存在，或该明细数据状态异常");
         }
@@ -2745,6 +2747,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 warehousebillsitems.setfQty(tWarehousebillsitems.getfQty());
                 warehousebillsitems.setfGrossweight(tWarehousebillsitems.getfGrossweight());
                 warehousebillsitems.setfNetweight(tWarehousebillsitems.getfNetweight());
+                warehousebillsitems.setfStevedore(tWarehousebillsitems.getfStevedore());
+                warehousebillsitems.setRemark(tWarehousebillsitems.getRemark());
+                warehousebillsitems.setfWarehouselocid(tWarehousebillsitems.getfWarehouselocid());
                 if (instalTWhgenleg(warehouseBills, warehousebillsitems, loginUser.getUser()) <= 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("新增库存总账失败");
@@ -2799,6 +2804,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 tEnclosureMapper.insertTEnclosure(enclosure);
             }
         }
+        TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(warehouseBills.getfId());
+        warehouseBills.setfQty(itemInFo.getfQty());
+        warehouseBills.setfNetweight(itemInFo.getfNetweight());
+        warehouseBills.setfGrossweight(itemInFo.getfGrossweight());
+        tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
         return AjaxResult.success();
     }
 

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -2264,7 +2264,8 @@
             w.f_planvolumn fPlanvolumn,
             w.f_plannetweight fPlannetweight,
             w.f_plangrossweight fPlangrossweight,
-            w.f_grossweight fGrossweight,
+            IFNULL(ROUND(w.f_grossweight/1000.3465,2),0) fGrossweight,
+            w.f_grossweight fGrossweights,
             w.f_storekeeper fStorekeeper,
             w.create_by createBy,
             w.f_warehouseid fWarehouseid,
@@ -2359,7 +2360,8 @@
             cntr.f_name cntrtypes,
             t.f_cntrtype fCntrtype,
             t.f_qty fQty,
-            t.f_grossweight fGrossweight,
+            IFNULL(ROUND(w.f_grossweight/1000.3465,2),0) fGrossweight,
+            t.f_grossweight fGrossweights,
             t.f_cntqty fCntqty,
         CASE
 		    WHEN t.f_billstatus = '10' THEN