2022年10月20日11:42:30

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

@@ -1685,13 +1685,21 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("库存明细第" + line + "行未找到入库日期，请确认");
                 }
-
-                wbItem.setfPid(fPid);
-                wbItem.setfBilltype(billsType);
-                wbItem.setCreateTime(new Date());
-                wbItem.setfBillno(warehouseBills.getfBillno());
-                wbItem.setCreateBy(loginUser.getUser().getUserName());
-                tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem);
+                if(wbItem.getfId() == null){
+                    wbItem.setfPid(fPid);
+                    wbItem.setfBilltype(billsType);
+                    wbItem.setCreateTime(new Date());
+                    wbItem.setfBillno(warehouseBills.getfBillno());
+                    wbItem.setCreateBy(loginUser.getUser().getUserName());
+                    tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem);
+                }else{
+                    wbItem.setfPid(fPid);
+                    wbItem.setfBilltype(billsType);
+                    wbItem.setUpdateTime(new Date());
+                    wbItem.setfBillno(warehouseBills.getfBillno());
+                    wbItem.setUpdateBy(loginUser.getUser().getUserName());
+                    tWarehousebillsitemsMapper.updateTWarehousebillsitems(wbItem);
+                }
             }
         }
         //  箱型数据

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

@@ -513,7 +513,7 @@
             <if test="map.billType == 'DZRevoke'">
                 f_statement_no = #{map.tFee.fBillno},
                 f_accamount = f_accamount - #{map.tFeeDo.fAmt},
-                f_accamount_date = #{map.tFee.fAccbilldate}
+                f_accamount_date = null
             </if>
             /*判断收付款*/
             <if test="map.billType == 'DC'">