修改出库确认 按钮

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

@@ -726,7 +726,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     }
                     // 更新库存总账
                     updateTWhgenlegData(wbItem, tWhgenle.getfId(), billsType);
+                    if (StringUtils.isNull(tWarehouseBills.getfBsdate()) || StringUtils.isNull(wbItem.getfChargedate())) {
+                        return AjaxResult.error("库存明细第" + i + "行请检查日期，操作终止");
+                    }
                     long dateDay = DateUtils.getDateDay(tWarehouseBills.getfBsdate(), wbItem.getfChargedate());
+                    if (StringUtils.isNull(tWarehouseBills.getfCorpid())) {
+                        return AjaxResult.error("库存明细第" + i + "行请检查客户信息，操作终止");
+                    }
                     long fCorpid = tWarehouseBills.getfCorpid();
                     TGoods tGoods = tGoodsMapper.selectTGoodsById(wbItem.getfGoodsid());
                     long fGoodsid = tGoods.getfTypeid();
@@ -738,9 +744,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                         return AjaxResult.error("库存明细第" + i + "行没有维护出库明细的仓储协议，操作终止");
                     }
-                    TWarehousebillsfees fees = new TWarehousebillsfees();
                     Long feeId = (Long) objectMap.get("feeId");
                     BigDecimal amt = (BigDecimal) objectMap.get("amt");
+                    TFees tFees = tFeesMapper.selectTFeesById(feeId);
+                    if (StringUtils.isNotNull(tFees)) {
+                        feesList.add(tFees);
+                    }
+                    TWarehousebillsfees fees = new TWarehousebillsfees();
                     fees.setfPid(fPid);
                     fees.setfFeeid(feeId);
                     fees.setfCorpid(tWarehouseBills.getfCorpid());
@@ -748,11 +758,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     fees.setfQty(new BigDecimal(1));
                     fees.setfUnitprice(amt);
                     fees.setfAmount(amt);
+                    fees.setfExrate(new BigDecimal(1));
+                    fees.setfCurrency("RMB");
+                    fees.setRemark(dateDay + "天" + tFees.getfName());
                     warehousebillsfees.add(fees);
-                    TFees tFees = tFeesMapper.selectTFeesById(feeId);
-                    if (StringUtils.isNotNull(tFees)) {
-                        feesList.add(tFees);
-                    }
                 }
             } else if ("CKDB".equals(billsType)) { // 调拨查询
                 if (StringUtils.isNull(tWhgenle)) { // 为空 提示没有库存

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

@@ -79,37 +79,39 @@
     <select id="selectGoodsTransferitemsList" parameterType="TWarehousebillsitems" resultType="Map">
         select
         DISTINCT
-        item.f_id AS fId,
-        item.f_pid AS fPid,
-        item.f_lineno AS fLineno,
-        item.f_goodsid AS fGoodsid,
-        goods.f_name AS fGoodsids,
-        item.f_warehouselocid AS fWarehouselocid,
-        area.f_name AS fWarehouselocids,
-        item.f_originalbillno AS fOriginalbillno,
-        item.f_mblno AS fMblno,
-        item.f_bsdate AS fBsdate,
-        item.f_boxno AS fBoxno,
-        item.f_cntqty AS fCntqty,
-        item.f_goodsval AS fGoodsval,
-        item.f_cntrtype AS fCntrtype,
-        item.f_planqty AS fPlanqty,
-        item.f_planvolumn AS fPlanvolumn,
-        item.f_packagespecs AS fPackagespecs,
-        item.f_plangrossweight AS fPlangrossweight,
-        item.f_plannetweight AS fPlannetweight,
-        item.f_qty AS fQty,
-        item.f_volumn AS fVolumn,
-        item.f_grossweight AS fGrossweight,
-        item.f_netweight AS fNetweight,
-        item.f_cntrno AS fCntrno,
-        item.f_truckno AS fTruckno,
-        item.f_billstatus AS fBillstatus,
-        item.remark
+            item.f_id AS fId,
+            item.f_pid AS fPid,
+            item.f_lineno AS fLineno,
+            item.f_goodsid AS fGoodsid,
+            goods.f_name AS fGoodsids,
+            item.f_warehouselocid AS fWarehouselocid,
+            area.f_name AS fWarehouselocids,
+            item.f_originalbillno AS fOriginalbillno,
+            item.f_mblno AS fMblno,
+            item.f_bsdate AS fBsdate,
+            item.f_boxno AS fBoxno,
+            item.f_cntqty AS fCntqty,
+            item.f_goodsval AS fGoodsval,
+            item.f_cntrtype AS fCntrtype,
+            item.f_planqty AS fPlanqty,
+            item.f_planvolumn AS fPlanvolumn,
+            item.f_billingway AS fBillingway,
+            item.f_chargedate AS fChargedate,
+            item.f_packagespecs AS fPackagespecs,
+            item.f_plangrossweight AS fPlangrossweight,
+            item.f_plannetweight AS fPlannetweight,
+            item.f_qty AS fQty,
+            item.f_volumn AS fVolumn,
+            item.f_grossweight AS fGrossweight,
+            item.f_netweight AS fNetweight,
+            item.f_cntrno AS fCntrno,
+            item.f_truckno AS fTruckno,
+            item.f_billstatus AS fBillstatus,
+            item.remark
         from
-        t_warehousebillsitems item
-        LEFT JOIN t_goods goods ON goods.f_id = item.f_goodsid
-        LEFT JOIN t_warehouse_area area ON area.f_id = item.f_warehouselocid
+            t_warehousebillsitems item
+            LEFT JOIN t_goods goods ON goods.f_id = item.f_goodsid
+            LEFT JOIN t_warehouse_area area ON area.f_id = item.f_warehouselocid
         <where>
             <if test="fPid != null ">and item.f_pid = #{fPid}</if>
         </where>