fix:修复ERP回传物料信息不存在

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/SecondFloorInStorageTask.java

@@ -40,7 +40,7 @@ import java.util.stream.Collectors;
  * @Date  2025/2/6 14:34
  * 二楼入库任务
  */
-@Service
+@Service("secondFloorInStorage")
 @Slf4j
 public class SecondFloorInStorageTask extends AbstractTask {
 
@@ -109,8 +109,7 @@ public class SecondFloorInStorageTask extends AbstractTask {
         QueryWrapper<StIvtStructattr> query = new QueryWrapper<StIvtStructattr>()
                 .eq("is_used", true)
                 .eq("lock_type", StatusEnum.LOCK.code("无锁"))
-                .eq("stor_code", "FStockId")
+                .eq("stor_code", "CStockId");
-                .eq("sect_code", "LXHCK01");
         query.isNull("vehicle_code");
         List<StIvtStructattr> list = iStIvtStructattrService.list(query);
         List<StIvtStructattr> structList = sameBlockNumRuleHandler.handler(list, null);

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/external_system/acs/service/AcsToWmsService.java

@@ -49,7 +49,6 @@ public class AcsToWmsService {
 
     public void applyTask(String service,String type,JSONObject data){
         if (service.equals("InStorage")){
-
             applyTaskMap.get(type).createTask(data);
         }
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/SyncReceiptProcessHandler.java

@@ -1,6 +1,7 @@
 package org.nl.wms.flow_manage.flow.service.classprocessimpl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -157,6 +158,9 @@ public class SyncReceiptProcessHandler implements ClassProcess {
             for (int i = 0; i < fEntityArray.size(); i++) {
                 JSONObject fEntity = fEntityArray.getJSONObject(i);
                 List<MdMeMaterialbase> materialList = iMdMeMaterialbaseService.list(new LambdaQueryWrapper<MdMeMaterialbase>().eq(MdMeMaterialbase::getMaterial_code,JSON.parseObject(fEntity.getString("FMaterialId")).getString("FNumber")));
+                if (ObjectUtil.isEmpty(materialList)) {
+                    throw new BadRequestException("回传失败:查询物料信息，物料编码不存在："+JSON.parseObject(fEntity.getString("FMaterialId")).getString("FNumber"));
+                }
                 MdMeMaterialbase materialInfo = materialList.get(0);
                 //没有启用批次号
                 if ("0".equals(materialInfo.getPrint_no())) {

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaOutController.java

@@ -56,12 +56,17 @@ public class PdaOutController {
 
     public ResponseEntity<List<Map>> orderType() {
         List<Map> result = new ArrayList<>();
-        List<BmFormStruc> list = iBmFormStrucService.list(new QueryWrapper<BmFormStruc>()
+        //        List<BmFormStruc> list = iBmFormStrucService.list(new QueryWrapper<BmFormStruc>()
-                .like("form_desc","出库")
+        //                .like("form_desc","出库")
-                .select("form_type","form_name"));
+        //                .select("form_type","form_name"));
-        for (BmFormStruc formStruc : list) {
+        //        for (BmFormStruc formStruc : list) {
-            result.add(MapOf.of("text",formStruc.getForm_name(),"value",formStruc.getForm_type()));
+        //            result.add(MapOf.of("text",formStruc.getForm_name(),"value",formStruc.getForm_type()));
-        }
+        //        }
+        result.add(MapOf.of("text","生产用料清单","value","PRD_PPBOM"));
+        result.add(MapOf.of("text","委外用料清单","value","SUB_PickMtrl"));
+        result.add(MapOf.of("text","直接调拨单","value","STK_TransferDirect"));
+        result.add(MapOf.of("text","简单领料申请单","value","ka7c19edf9d4b4b39b8cc4a06802163b0"));
+        result.add(MapOf.of("text","其他出库单","value","STK_MisDelivery"));
         return new ResponseEntity<>(result,HttpStatus.OK);
     }
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java

@@ -232,6 +232,7 @@ public class SyncErpBillsScheduleService {
                 filterString += "AND FDocumentStatus = 'C'  AND F_PMSY_BillStatus = 'A' AND F_PMSY_CreateDate >= '" + timeStart + " 00:00:00'  AND F_PMSY_CreateDate <= '" + timeEnd + " 23:59:59' ";
             } else if ("SAL_SaleOrder".equals(formType)) {
                 filterString += " AND FDocumentStatus = 'C'  AND FCloseStatus ='A'  AND FCreateDate >= '" + timeStart + " 00:00:00' and FCreateDate <= '" + timeEnd + " 23:59:59'  ";
+                //调拨出入库，采购退料单，销售退货入库单，其他出库单
             } else if ("STK_TransferDirect".equals(formType) || "STK_MisDelivery".equals(formType) || "PUR_MRB".equals(formType) || "SAL_RETURNSTOCK".equals(formType)) {
                 filterString += "  AND FDocumentStatus ='B'  AND FCreateDate >= '" + timeStart + " 00:00:00' and FCreateDate <= '" + timeEnd + " 23:59:59'  ";
             } else {

wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml

@@ -96,7 +96,39 @@
         <appender-ref ref="luceneAppender" />
         <queueSize>512</queueSize>
     </appender>
-
+    <springProfile name="dev">
+        <root level="info">
+            <appender-ref ref="asyncLuceneAppender"/>
+            <appender-ref ref="CONSOLE"/>
+        </root>
+        <logger name="org.nl.wms.system_manage.service.quartz.task" level="ERROR" additivity="true">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="jdbc" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.springframework" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.hibernate" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.quartz" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="com.google" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.redisson" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.nl.modules.wql" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.springframework.data" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+    </springProfile>
     <!--开发环境:打印控制台-->
     <springProfile name="dev3">
         <root level="info">