2024年7月17日16:42:36

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/domain/TWareHouseItemsExcel.java

@@ -56,6 +56,12 @@ public class TWareHouseItemsExcel {
     private String fTrademodeid;
 
     /**
+     * 箱号
+     */
+    @Excel(name = "箱号")
+    private String fCntrno;
+
+    /**
      * 件数
      */
     @Excel(name = "件数")
@@ -92,6 +98,14 @@ public class TWareHouseItemsExcel {
     @Excel(name = "司机身份证")
     private String fDriverIdCar;
 
+    public String getfCntrno() {
+        return fCntrno;
+    }
+
+    public void setfCntrno(String fCntrno) {
+        this.fCntrno = fCntrno;
+    }
+
     public String getfDrivername() {
         return fDrivername;
     }

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

@@ -2107,13 +2107,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             tWarehousebillsitems.setCreateBy(SecurityUtils.getUsername());
             tWarehousebillsitemsMapper.insertTWarehousebillsitems(tWarehousebillsitems);
         } else {
-            TWarehousebillsitems warehousebillsitems = tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(tWarehousebillsitems.getfId());
+            /*TWarehousebillsitems warehousebillsitems = tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(tWarehousebillsitems.getfId());
             if (StringUtils.isNull(warehousebillsitems)) {
                 return AjaxResult.error("未找到明细信息，请确认该明细信息是否存在");
             }
             if (warehousebillsitems.getfBillstatus() != 30L) {
                 return AjaxResult.error("该明细信息异常" + warehousebillsitems.getfBillstatus() + "，请确认");
-            }
+            }*/
             tWarehousebillsitems.setUpdateTime(new Date());
             tWarehousebillsitems.setUpdateBy(SecurityUtils.getUsername());
             tWarehousebillsitemsMapper.updateTWarehousebillsitems(tWarehousebillsitems);

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

@@ -957,6 +957,7 @@
         it.f_driver_name AS fDriverName,
         it.f_truckno AS fTruckno,
         it.f_driver_id_car AS fDriverIdCar,
+        it.f_cntrno AS fCntrno,
         CASE
         it.f_billtype
         WHEN 'SJRK' THEN
@@ -1026,6 +1027,7 @@
             it.f_driver_name AS fDriverName,
             it.f_truckno AS fTruckno,
             it.f_driver_id_car AS fDriverIdCar,
+            it.f_cntrno AS fCntrno,
             CASE
             it.f_billtype
             WHEN 'SJRK' THEN
@@ -1115,7 +1117,8 @@
         it.f_netweight AS fNetweight,
         it.f_driver_name AS fDrivername,
         it.f_truckno AS fTruckno,
-        it.f_driver_id_car AS fDriverIdCar
+        it.f_driver_id_car AS fDriverIdCar,
+        it.f_cntrno AS fCntrno
         FROM
         t_warehousebills leg
         LEFT JOIN t_warehousebillsitems it ON leg.f_id = it.f_pid