2023年1月6日18:23:01

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInStockController.java

@@ -188,8 +188,8 @@ public class TWarehouseInStockController extends BaseController {
      */
     //@Log(title = "导入集装箱动态", businessType = BusinessType.IMPORT)
     @PostMapping(value = "/importInstock")
-    public AjaxResult importInstock(@RequestParam("file") MultipartFile file) {
-        return itWarehouseBillsService.importLibraryInformation(file);
+    public AjaxResult importInstock(@RequestParam("file") MultipartFile file,@RequestParam(value = "fWarehouseid",required = false) Long fWarehouseid) {
+        return itWarehouseBillsService.importLibraryInformation(file,fWarehouseid);
     }
 
     /**

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TWarehouseMapper.java

@@ -271,5 +271,7 @@ public interface TWarehouseMapper {
      *  作业统计趋势数据
      */
     List<Map<String, Object>> getWorkTrend(@Param("wareHouseId")String wareHouseId,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("countType") String countType);
+
+    TWarehouse selectByPidANDName(@Param("stringCellValue")String stringCellValue, @Param("fWarehouseid")Long fWarehouseid);
 }
 

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

@@ -612,7 +612,7 @@ public interface ITWarehouseBillsService {
      * @param file 文件
      * @return
      */
-    public AjaxResult importLibraryInformation(MultipartFile file);
+    public AjaxResult importLibraryInformation(MultipartFile file,Long fWarehouseid);
 
     /**
      * 计算出库仓储费

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

@@ -1001,11 +1001,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray jsonDrArray = JSONArray.parseArray(tEnclosure);
             List<TEnclosure> tEnclosureList = JSONObject.parseArray(jsonDrArray.toJSONString(), TEnclosure.class);
             for (TEnclosure enclosure : tEnclosureList) {
-                if (ObjectUtils.isNotNull(enclosure.getfId())){
+                if (ObjectUtils.isNotNull(enclosure.getfId())) {
                     enclosure.setUpdateBy(loginUser.getUser().getUserName());
                     enclosure.setUpdateTime(new Date());
                     tEnclosureMapper.updateTEnclosure(enclosure);
-                }else{
+                } else {
                     enclosure.setfPid(fPid);
                     enclosure.setCreateBy(loginUser.getUser().getUserName());
                     enclosure.setCreateTime(new Date());
@@ -1024,7 +1024,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("箱型数据第" + line + "行数据缺少必填数据");
                 }
-                if (ObjectUtils.isNotNull(cntr.getfId())){
+                if (ObjectUtils.isNotNull(cntr.getfId())) {
                     cntr.setfPid(fPid);
                     cntr.setfGoodsid(0L);
                     cntr.setfPackageid("0");
@@ -1032,7 +1032,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     cntr.setCreateBy(loginUser.getUser().getUserName());
                     cntr.setCreateTime(new Date());
                     tWarehousebillsCntrMapper.updateTWarehousebillsCntr(cntr);
-                }else{
+                } else {
                     cntr.setfPid(fPid);
                     cntr.setfGoodsid(0L);
                     cntr.setfPackageid("0");
@@ -1048,7 +1048,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray jsonDrArray = JSONArray.parseArray(tWarehousebillsfeesDr);
             List<TWarehousebillsfees> warehousebillsfeesDrList = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsfees.class);
             for (TWarehousebillsfees wbDr : warehousebillsfeesDrList) {
-                if (ObjectUtils.isNotNull(wbDr.getfId())){
+                if (ObjectUtils.isNotNull(wbDr.getfId())) {
                     // 检验  数量*单价=金额
                     wbDr.setfPid(fPid);
                     wbDr.setfDc("D");
@@ -1060,7 +1060,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         wbDr.setfBsdate(warehouseBills.getfBsdate());
                     }
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
-                }else{
+                } else {
                     // 检验  数量*单价=金额
                     wbDr.setfPid(fPid);
                     wbDr.setfDc("D");
@@ -1080,29 +1080,29 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsfeesCr);
             List<TWarehousebillsfees> warehousebillsfeesCrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
             for (TWarehousebillsfees wbCr : warehousebillsfeesCrList) {
-               if (ObjectUtils.isNotNull(wbCr.getfId())){
-                   wbCr.setfPid(fPid);
-                   wbCr.setfDc("C");
-                   wbCr.setfBilltype(billsType);
-                   wbCr.setUpdateTime(new Date());
-                   wbCr.setSrcBillNo(warehouseBills.getfBillno());
-                   wbCr.setUpdateBy(loginUser.getUser().getUserName());
-                   if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
-                       wbCr.setfBsdate(warehouseBills.getfBsdate());
-                   }
-                   tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
-               }else{
-                   wbCr.setfPid(fPid);
-                   wbCr.setfDc("C");
-                   wbCr.setfBilltype(billsType);
-                   wbCr.setCreateTime(new Date());
-                   wbCr.setSrcBillNo(warehouseBills.getfBillno());
-                   wbCr.setCreateBy(loginUser.getUser().getUserName());
-                   if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
-                       wbCr.setfBsdate(warehouseBills.getfBsdate());
-                   }
-                   tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
-               }
+                if (ObjectUtils.isNotNull(wbCr.getfId())) {
+                    wbCr.setfPid(fPid);
+                    wbCr.setfDc("C");
+                    wbCr.setfBilltype(billsType);
+                    wbCr.setUpdateTime(new Date());
+                    wbCr.setSrcBillNo(warehouseBills.getfBillno());
+                    wbCr.setUpdateBy(loginUser.getUser().getUserName());
+                    if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
+                        wbCr.setfBsdate(warehouseBills.getfBsdate());
+                    }
+                    tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
+                } else {
+                    wbCr.setfPid(fPid);
+                    wbCr.setfDc("C");
+                    wbCr.setfBilltype(billsType);
+                    wbCr.setCreateTime(new Date());
+                    wbCr.setSrcBillNo(warehouseBills.getfBillno());
+                    wbCr.setCreateBy(loginUser.getUser().getUserName());
+                    if (warehouseBills.getfBsdate() != null && !"".equals(warehouseBills.getfBsdate())) {
+                        wbCr.setfBsdate(warehouseBills.getfBsdate());
+                    }
+                    tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
+                }
             }
         }
         //查询删除的仓储费收费信息
@@ -1735,14 +1735,14 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("库存明细第" + line + "行未找到入库日期，请确认");
                 }
-                if(wbItem.getfId() == null){
+                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{
+                } else {
                     wbItem.setfPid(fPid);
                     wbItem.setfBilltype(billsType);
                     wbItem.setUpdateTime(new Date());
@@ -1763,7 +1763,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("箱型数据第" + cntrLine + "行数据缺少必填数据");
                 }
-                if (cntr.getfId() == null ){
+                if (cntr.getfId() == null) {
                     cntr.setfPid(fPid);
                     cntr.setfGoodsid(0L);
                     cntr.setfPackageid("0");
@@ -1771,7 +1771,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     cntr.setCreateBy(loginUser.getUser().getUserName());
                     cntr.setCreateTime(new Date());
                     tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
-                }else{
+                } else {
                     cntr.setUpdateBy(loginUser.getUser().getUserName());
                     cntr.setUpdateTime(new Date());
                     tWarehousebillsCntrMapper.updateTWarehousebillsCntr(cntr);
@@ -1783,7 +1783,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsfeesCr);
             List<TWarehousebillsfees> warehousebillsfeesCrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
             for (TWarehousebillsfees wbCr : warehousebillsfeesCrList) {
-                if (wbCr.getfId() == null ){
+                if (wbCr.getfId() == null) {
                     wbCr.setfPid(fPid);
                     wbCr.setfDc("C");
                     wbCr.setfBilltype(billsType);
@@ -1794,7 +1794,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         wbCr.setfBsdate(warehouseBills.getfBsdate());
                     }
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
-                }else{
+                } else {
                     wbCr.setUpdateBy(loginUser.getUser().getUserName());
                     wbCr.setUpdateTime(new Date());
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
@@ -1805,7 +1805,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsfeesDr);
             List<TWarehousebillsfees> warehousebillsfeesDrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
             for (TWarehousebillsfees wbDr : warehousebillsfeesDrList) {
-                if (wbDr.getfId() == null ){
+                if (wbDr.getfId() == null) {
                     wbDr.setfPid(fPid);
                     wbDr.setfDc("D");
                     // 防止二次发起请核后费用明细数据请核状态被修改
@@ -1820,7 +1820,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         wbDr.setfBsdate(warehouseBills.getfBsdate());
                     }
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
-                }else{
+                } else {
                     wbDr.setUpdateBy(loginUser.getUser().getUserName());
                     wbDr.setUpdateTime(new Date());
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
@@ -1833,13 +1833,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             long lineNo = 0L;
             for (TEnclosure enclosure : enclosuresList) {
                 lineNo++;
-                if (enclosure.getfId() == null ){
+                if (enclosure.getfId() == null) {
                     enclosure.setfPid(fPid);
                     enclosure.setfLineno(lineNo);
                     enclosure.setCreateTime(new Date());
                     enclosure.setCreateBy(loginUser.getUser().getUserName());
                     tEnclosureMapper.insertTEnclosure(enclosure);
-                }else{
+                } else {
                     enclosure.setUpdateBy(loginUser.getUser().getUserName());
                     enclosure.setUpdateTime(new Date());
                     tEnclosureMapper.updateTEnclosure(enclosure);
@@ -2375,7 +2375,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
      * @param tWarehouseBills
      * @return
      */
-    public List<OtherFinanceExcel> getOtherFinance(TWarehouseBills tWarehouseBills){
+    public List<OtherFinanceExcel> getOtherFinance(TWarehouseBills tWarehouseBills) {
         return tWarehouseBillsMapper.getOtherFinance(tWarehouseBills);
     }
 
@@ -2880,14 +2880,14 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("库存明细第" + line + "行未找到原始入库日期，请确认");
                 }
-                if (wbItem.getfId() == null){
+                if (wbItem.getfId() == null) {
                     wbItem.setfPid(fPid);
                     wbItem.setfBilltype(billsType);
                     wbItem.setCreateTime(new Date());
                     wbItem.setfBillno(warehouseBills.getfBillno());
                     wbItem.setCreateBy(user.getUserName());
                     tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem);
-                }else{
+                } else {
                     wbItem.setUpdateTime(new Date());
                     wbItem.setUpdateBy(user.getUserName());
                     tWarehousebillsitemsMapper.updateTWarehousebillsitems(wbItem);
@@ -2907,7 +2907,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     return AjaxResult.error("箱型数据第" + cntrLine + "行数据缺少必填数据");
                 }
 
-                if (cntr.getfId() == null){
+                if (cntr.getfId() == null) {
                     cntr.setfPid(fPid);
                     cntr.setfGoodsid(0L);
                     cntr.setfPackageid("0");
@@ -2915,7 +2915,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     cntr.setCreateBy(user.getUserName());
                     cntr.setfCntrweight(new BigDecimal(0));
                     tWarehousebillsCntrMapper.updateTWarehousebillsCntr(cntr);
-                }else{
+                } else {
                     cntr.setUpdateTime(new Date());
                     cntr.setUpdateBy(user.getUserName());
                     tWarehousebillsCntrMapper.updateTWarehousebillsCntr(cntr);
@@ -2928,7 +2928,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             List<TWarehousebillsfees> warehousebillsfeesCrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
             for (TWarehousebillsfees wbCr : warehousebillsfeesCrList) {
 
-                if (wbCr.getfId() == null){
+                if (wbCr.getfId() == null) {
                     wbCr.setfPid(fPid);
                     wbCr.setfDc("C");
                     wbCr.setfBilltype(billsType);
@@ -2936,7 +2936,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     wbCr.setSrcBillNo(warehouseBills.getfBillno());
                     wbCr.setCreateBy(user.getUserName());
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
-                }else{
+                } else {
                     wbCr.setUpdateTime(new Date());
                     wbCr.setUpdateBy(user.getUserName());
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
@@ -2948,7 +2948,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsfeesDr);
             List<TWarehousebillsfees> warehousebillsfeesDrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class);
             for (TWarehousebillsfees wbDr : warehousebillsfeesDrList) {
-                if (wbDr.getfId() == null){
+                if (wbDr.getfId() == null) {
                     wbDr.setfPid(fPid);
                     wbDr.setfDc("D");
                     wbDr.setfBillstatus(4L);
@@ -2957,7 +2957,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     wbDr.setSrcBillNo(warehouseBills.getfBillno());
                     wbDr.setCreateBy(user.getUserName());
                     tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
-                }else{
+                } else {
                     wbDr.setUpdateTime(new Date());
                     wbDr.setUpdateBy(user.getUserName());
                     tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
@@ -2971,13 +2971,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             long lineNo = 0L;
             for (TEnclosure enclosure : enclosuresList) {
                 lineNo++;
-                if (enclosure.getfId() == null){
+                if (enclosure.getfId() == null) {
                     enclosure.setfPid(fPid);
                     enclosure.setfLineno(lineNo);
                     enclosure.setCreateTime(new Date());
                     enclosure.setCreateBy(user.getUserName());
                     tEnclosureMapper.insertTEnclosure(enclosure);
-                }else{
+                } else {
                     enclosure.setUpdateTime(new Date());
                     enclosure.setUpdateBy(user.getUserName());
                     tEnclosureMapper.updateTEnclosure(enclosure);
@@ -4430,7 +4430,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
 
         // 处理银行反馈
         if (WarehouseTypeEnum.SJRK.getType().equals(billsType)) {
-            if (ObjectUtil.isNotNull(tWarehouseBills.getIsPledge())){
+            if (ObjectUtil.isNotNull(tWarehouseBills.getIsPledge())) {
                 SysConfig feedbackConfig = sysConfigMapper.checkConfigKeyUnique("bank.feedback");
                 if (ObjectUtil.isNotNull(feedbackConfig) && "0".equals(feedbackConfig.getConfigValue())) {
                     // 出入库不同处理
@@ -4802,7 +4802,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             // 处理银行反馈
             if (WarehouseTypeEnum.SJCK.getType().equals(billsType)) {
                 //是否质押
-                if(ObjectUtil.isNotNull(tWarehouseBills.getIsPledge())){
+                if (ObjectUtil.isNotNull(tWarehouseBills.getIsPledge())) {
                     if (ObjectUtil.isNotNull(feedbackConfig) && "0".equals(feedbackConfig.getConfigValue())) {
                         // 出入库不同处理
                         TCorps corp = tCorpsMapper.selectTCorpsById(tWhgenle.getfCorpid());
@@ -5889,7 +5889,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             item.setfBillstatus(tWarehousebills.getfBillstatus());
 
             //修改（同步业务时间为截止时间）   2022年11月9日16:09:52
-            if ("KCZZ".equals(item.getfBilltype()) && ObjectUtils.isNotNull(item.getfBillingDeadline())){
+            if ("KCZZ".equals(item.getfBilltype()) && ObjectUtils.isNotNull(item.getfBillingDeadline())) {
                 item.setfBsdate(item.getfBillingDeadline());
             }/*else{
                 return AjaxResult.error("仓储费截止日期不能为空");
@@ -6492,8 +6492,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     return true;
                 }
                 dateChanged = warehouseBills.getfDateChanged();
-                if (ObjectUtils.isNotNull(warehouseBills.getfChargedate())){
-                    tWarehousebillsfeesMapper.updateByPid(sysCheckCode.getfId(),warehouseBills.getfChargedate());
+                if (ObjectUtils.isNotNull(warehouseBills.getfChargedate())) {
+                    tWarehousebillsfeesMapper.updateByPid(sysCheckCode.getfId(), warehouseBills.getfChargedate());
                 }
                 break;
             case "freight":
@@ -6530,7 +6530,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
      * @return
      */
     @Override
-    public AjaxResult importLibraryInformation(MultipartFile file) {
+    public AjaxResult importLibraryInformation(MultipartFile file, Long fWarehouseid) {
         List<TWarehousebillsitems> itemList = new ArrayList<>();
         InputStream inputStream = null;
         try {
@@ -6601,6 +6601,75 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                                 warehousebillsitems.setfElabel(cell.getStringCellValue());
                             }
                             break;
+                        case "品名":
+                            // 设置单元格类型
+                            cell.setCellType(CellType.STRING);
+                            if (StringUtils.isNotEmpty(cell.getStringCellValue())) {
+                                TGoods tGoods = tGoodsMapper.getGoodsByName(cell.getStringCellValue());
+                                if (ObjectUtils.isNotNull(tGoods)) {
+                                    warehousebillsitems.setfGoodsid(tGoods.getfId());
+                                }
+                            }
+                            break;
+                        case "货物属性":
+                            // 设置单元格类型
+                            cell.setCellType(CellType.STRING);
+                            if (StringUtils.isNotEmpty(cell.getStringCellValue())) {
+                                String storage_type = sysDictDataMapper.selectDictValue("storage_type", cell.getStringCellValue());
+                                if (ObjectUtils.isNotNull(storage_type)) {
+                                    warehousebillsitems.setfBusinessType(Long.parseLong(storage_type));
+                                } else {
+                                    warehousebillsitems.setfBusinessType(null);
+                                }
+                            }
+                            break;
+                        case "属性详情":
+                            // 设置单元格类型
+                            cell.setCellType(CellType.STRING);
+                            if (StringUtils.isNotEmpty(cell.getStringCellValue())) {
+                                warehousebillsitems.setfMarks(cell.getStringCellValue());
+                            }
+                            break;
+                        case "库区":
+                            // 设置单元格类型
+                            cell.setCellType(CellType.STRING);
+                            if (StringUtils.isNotEmpty(cell.getStringCellValue()) && ObjectUtils.isNotNull(fWarehouseid)) {
+                                TWarehouse tWarehouse = tWarehouseMapper.selectByPidANDName(cell.getStringCellValue(), fWarehouseid);
+                                if (ObjectUtils.isNotNull(tWarehouse)) {
+//                                    if (ObjectUtils.isNotNull(tWarehouse.getAncestors())) {
+//                                        String[] arrs = tWarehouse.getAncestors().split(",");
+//                                        String text = "";
+//                                        for (String arr : arrs) {
+//                                            tWarehouseMapper.selectTWarehouseById();
+//                                        }
+//                                    }
+                                    warehousebillsitems.setfWarehouselocid(tWarehouse.getfId());
+//                                    warehousebillsitems.setfWarehouseInformation(tCntr.getfId() + "");
+                                } else {
+                                    warehousebillsitems.setfWarehouselocid(null);
+                                    warehousebillsitems.setfWarehouseInformation(null);
+                                }
+                            }
+                            break;
+                        case "箱型":
+                            // 设置单元格类型
+                            cell.setCellType(CellType.STRING);
+                            if (StringUtils.isNotEmpty(cell.getStringCellValue())) {
+                                TCntr tCntr = tCntrMapper.selectTcnrFName(cell.getStringCellValue());
+                                if (ObjectUtils.isNotNull(tCntr)) {
+                                    warehousebillsitems.setfCntrtype(tCntr.getfId() + "");
+                                } else {
+                                    warehousebillsitems.setfCntrtype(null);
+                                }
+                            }
+                            break;
+                        case "箱量":
+                            // 设置单元格类型
+                            cell.setCellType(CellType.STRING);
+                            if (StringUtils.isNotEmpty(cell.getStringCellValue())) {
+                                warehousebillsitems.setfCntqty(Long.parseLong(cell.getStringCellValue()));
+                            }
+                            break;
                     }
                 }
                 if (StringUtils.isNotEmpty(warehousebillsitems.getfCntrno())) {
@@ -9234,7 +9303,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         // 全部库存
         data.put("stockTotal", stockStatistics(null, null, external, mode));
         // 结余净重
-        data.put("stockNetweightbl", stockWeightblc(null, null , external, mode));
+        data.put("stockNetweightbl", stockWeightblc(null, null, external, mode));
 
         // 今天
         data.put("inStockTotalToday", inAndOutStockStatistics("SJRK", DateUtils.today(), DateUtils.today(), external, mode));
@@ -9957,8 +10026,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             tWarehousebillsitemsElabel.setfType(1);
             tWarehousebillsitemsElabel.setfStatus(2);
             List<TWarehousebillsitemsElabel> tWarehousebillsitemsElabelList = elabelMapper.selectList(tWarehousebillsitemsElabel);
-            if (warehousebillsitems.getfQty() != tWarehousebillsitemsElabelList.size()){
-                return AjaxResult.error("入库件数："+warehousebillsitems.getfQty()+"与标签码数量："+tWarehousebillsitemsElabelList.size()+"不一致，不允许入库");
+            if (warehousebillsitems.getfQty() != tWarehousebillsitemsElabelList.size()) {
+                return AjaxResult.error("入库件数：" + warehousebillsitems.getfQty() + "与标签码数量：" + tWarehousebillsitemsElabelList.size() + "不一致，不允许入库");
             }
 
             // 查询库容量  是否可入库
@@ -10018,8 +10087,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             tWarehousebillsitemsElabel.setfType(2);
             tWarehousebillsitemsElabel.setfStatus(2);
             List<TWarehousebillsitemsElabel> tWarehousebillsitemsElabelList = elabelMapper.selectList(tWarehousebillsitemsElabel);
-            if (warehousebillsitems.getfQty() != tWarehousebillsitemsElabelList.size()){
-                return AjaxResult.error("出库件数："+warehousebillsitems.getfQty()+"与标签码数量："+tWarehousebillsitemsElabelList.size()+"不一致，不允许出库");
+            if (warehousebillsitems.getfQty() != tWarehousebillsitemsElabelList.size()) {
+                return AjaxResult.error("出库件数：" + warehousebillsitems.getfQty() + "与标签码数量：" + tWarehousebillsitemsElabelList.size() + "不一致，不允许出库");
             }
             // 跟新库存总账
             updateTWhgenlegData(warehousebillsitems, tWhgenle.getfId(), billsType);
@@ -10116,6 +10185,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
 
     /**
      * 通过原始入库业务编号查找数据
+     *
      * @param originalBillNo
      * @return
      */

ruoyi-warehouse/src/main/resources/mapper/basicData/TWarehouseMapper.xml

@@ -698,4 +698,10 @@
             </if>
         </where>
     </select>
+    <select id="selectByPidANDName" resultMap="TWarehouseResult">
+        <include refid="selectTWarehouseVo"/>
+        <where>
+            parent_id = #{fWarehouseid} and del_flag = '0' and f_name =#{stringCellValue}
+        </where>
+    </select>
 </mapper>