根据提单号查询仓库与客户信息

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehousebillsitems.java

@@ -32,6 +32,10 @@ public class TWarehousebillsitems extends BaseEntity {
     @Excel(name = "来源id")
     private Long fSrcid;
 
+    /** 调入库存总帐id */
+    @Excel(name = "调入库存总帐id")
+    private Long fTransferInventoryid;
+
     /**
      * 行号，针对pid顺序排列，1，2，3，4，
      */
@@ -350,6 +354,14 @@ public class TWarehousebillsitems extends BaseEntity {
     @TableField(exist = false)
     private Long fTocorpid;
 
+    public Long getfTransferInventoryid() {
+        return fTransferInventoryid;
+    }
+
+    public void setfTransferInventoryid(Long fTransferInventoryid) {
+        this.fTransferInventoryid = fTransferInventoryid;
+    }
+
     public Long getfTocorpid() {
         return fTocorpid;
     }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/vo/CalculateStorageFeesInfoVO.java

@@ -23,6 +23,9 @@ public class CalculateStorageFeesInfoVO implements Serializable {
     //物资Id
     private Long fGoodsid;
 
+    //调入库存总帐id
+    private Long fTransferInventoryid;
+
     //业务日期
     private Date fBsdate;
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java

@@ -196,7 +196,7 @@ public interface ITWarehouseBillsService {
                             String warehousebillsfeesDr, LoginUser loginUser, String tCntr, String billsType);
 
     /**
-     * 入库 、 出库  修改 从表状态
+     * 入库确认 、 出库确认  修改 从表状态
      *
      * @param warehouseBills
      * @param warehousebillsitems

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

@@ -454,15 +454,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         // 业务类型详情
         tWhgenleg.setfMarks(warehousebillsitems.getfMarks());
         // 业务日期
-        tWhgenleg.setfBsdate(warehousebillsitems.getfBsdate());
-    1
-        1
-                1
-                        1
-                                11
-                                        1
-                                                1
-    1
+        if (!WarehouseTypeEnum.SJRK.getType().equals(warehousebillsitems.getfBilltype())) {
+            tWhgenleg.setfBsdate(warehousebillsitems.getfOriginalbilldate());
+        } else {
+            tWhgenleg.setfBsdate(warehousebillsitems.getfBsdate());
+        }
         if ("1".equals(ifCntrno)) {
             tWhgenleg.setfCntrno(warehousebillsitems.getfCntrno());
         }
@@ -3576,7 +3572,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     }
 
     /**
-     * 出库、调拨、货转 确认
+     * 出库确认、调拨确认、货转确认
      *
      * @param warehouseBills
      * @param warehousebillsitems
@@ -3634,9 +3630,15 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 transferWarehouselocid = wbItem.getfTransferWarehouselocid();
 //                wbItem.setfWarehouselocid(transferWarehouselocid);
             }
-            // 根据来源编号查出库存总账的信息
-            TWhgenleg tWhgenle = tWhgenlegMapper.selectTWhgenlegById(wbItem.getfSrcid());
-                // 查询总账是否存在
+            // 查询总账是否存在
+            TWhgenleg tWhgenle;
+            if (StringUtils.isNotNull(wbItem.getfSrcid())) {
+                // 根据来源编号查出库存总账的信息
+                tWhgenle = tWhgenlegMapper.selectTWhgenlegById(wbItem.getfSrcid());
+            } else {
+                tWhgenle = queryTWhgenleg(tWarehouseBills, wbItem, goods.getIfCntrno());
+            }
+            // 查询总账是否存在
             if (Objects.isNull(tWhgenle)) {
                 throw new WarehouseException("库存明细第" + i + "行找不到库存信息");
             }
@@ -3644,7 +3646,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 throw new WarehouseException("业务日期不得超出库存总帐日期");
             }
             //  入库数特殊不判断入账
-            if ("SJCK".equals(billsType)) { // 出库 查询
+            if (WarehouseTypeEnum.SJCK.getType().equals(billsType)) { // 出库 查询
                 if (StringUtils.isNull(tWarehouseBills.getfBsdate()) || StringUtils.isNull(wbItem.getfChargedate())) {
                     return AjaxResult.error("库存明细第" + i + "行请检查日期，操作终止");
                 }

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

@@ -11,6 +11,7 @@
         <result property="fLineno" column="f_lineno"/>
         <result property="fBillno" column="f_billno"/>
         <result property="fGoodsid" column="f_goodsid"/>
+        <result property="fTransferInventoryid" column="f_transfer_inventoryid"/>
         <result property="fMblno" column="f_mblno"/>
         <result property="fOriginalbillno" column="f_originalbillno"/>
         <result property="fTransferWarehouselocid" column="f_transfer_warehouselocid"/>
@@ -84,6 +85,7 @@
         <result property="fChargedate" column="f_chargedate"/>
         <result property="fOriginalbilldate" column="f_originalbilldate"/>
         <result property="fMblno" column="f_mblno"/>
+        <result property="fTransferInventoryid" column="f_transfer_inventoryid"/>
         <result property="fVolumn" column="f_volumn"/>
         <result property="fMarks" column="f_marks"/>
         <result property="fBillingDays" column="f_billing_days"/>
@@ -98,7 +100,7 @@
     </resultMap>
 
     <sql id="selectTWarehousebillsitemsVo">
-        select f_id, f_pid, f_srcid, f_lineno, f_billno, f_goodsid, f_mblno, f_originalbillno, f_transfer_warehouselocid, f_warehouselocid,
+        select f_id, f_pid, f_srcid, f_lineno, f_billno, f_goodsid, f_mblno, f_transfer_inventoryid, f_originalbillno, f_transfer_warehouselocid, f_warehouselocid,
          f_originalbilldate, f_bsdate, f_billingway, f_chargedate, f_boxno, f_goodsval, f_cntqty, f_packagespecs, f_cntrtype, f_planvolumn,
           f_planqty, f_plangrossweight, f_plannetweight, f_volumn, f_qty, f_grossweight, f_netweight, f_cntrno, f_truckno, f_marks, f_billstatus,
            del_flag, create_by, create_time, update_by, update_time, remark, f_inventory_days, f_storage_fee_deadline, f_amt, f_billing_days,
@@ -116,6 +118,7 @@
             <if test="fGoodsid != null ">and f_goodsid = #{fGoodsid}</if>
             <if test="fMblno != null  and fMblno != ''">and f_mblno = #{fMblno}</if>
             <if test="fBillno != null  and fBillno != ''">and f_billno = #{fBillno}</if>
+            <if test="fTransferInventoryid != null ">and f_transfer_inventoryid = #{fTransferInventoryid}</if>
             <if test="fWarehouselocid != null ">and f_warehouselocid = #{fWarehouselocid}</if>
             <if test="fBsdate != null ">and f_bsdate = #{fBsdate}</if>
             <if test="fLabour != null ">and f_labour = #{fLabour}</if>
@@ -176,6 +179,7 @@
             ware.f_name AS fWarehouseids,
             item.f_is_pass AS fIsPass,
             item.f_originalbillno AS fOriginalbillno,
+            item.f_transfer_inventoryid AS fTransferInventoryid,
             item.f_mblno AS fMblno,
             item.f_bsdate AS fBsdate,
             item.f_boxno AS fBoxno,
@@ -251,6 +255,7 @@
             <if test="fBillno != null">f_billno,</if>
             <if test="fGoodsid != null">f_goodsid,</if>
             <if test="fMblno != null">f_mblno,</if>
+            <if test="fTransferInventoryid != null">f_transfer_inventoryid,</if>
             <if test="fOriginalbillno != null">f_originalbillno,</if>
             <if test="fTransferWarehouselocid != null">f_transfer_warehouselocid,</if>
             <if test="fWarehouselocid != null">f_warehouselocid,</if>
@@ -318,6 +323,7 @@
             <if test="fBillno != null">#{fBillno},</if>
             <if test="fGoodsid != null">#{fGoodsid},</if>
             <if test="fMblno != null">#{fMblno},</if>
+            <if test="fTransferInventoryid != null">#{fTransferInventoryid},</if>
             <if test="fOriginalbillno != null">#{fOriginalbillno},</if>
             <if test="fTransferWarehouselocid != null">#{fTransferWarehouselocid},</if>
             <if test="fWarehouselocid != null">#{fWarehouselocid},</if>
@@ -388,6 +394,7 @@
             <if test="fBillno != null">f_billno = #{fBillno},</if>
             <if test="fGoodsid != null">f_goodsid = #{fGoodsid},</if>
             <if test="fMblno != null">f_mblno = #{fMblno},</if>
+            <if test="fTransferInventoryid != null">f_transfer_inventoryid = #{fTransferInventoryid},</if>
             <if test="fOriginalbillno != null">f_originalbillno = #{fOriginalbillno},</if>
             <if test="fTransferWarehouselocid != null">f_transfer_warehouselocid = #{fTransferWarehouselocid},</if>
             <if test="fWarehouselocid != null">f_warehouselocid = #{fWarehouselocid},</if>
@@ -485,6 +492,7 @@
             item.f_billingway AS fBillingway,
             item.f_chargedate AS fChargedate,
             item.f_originalbilldate AS fOriginalbilldate,
+            item.f_transfer_inventoryid AS fTransferInventoryid,
             item.f_mblno AS fMblno,
             item.f_volumn AS fVolumn,
             item.f_marks AS fMarks,