add:增加合格证入库功能。

wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/SpelUtil.java

@@ -80,6 +80,9 @@ public class SpelUtil {
             , "827075", "A1", "827074", "A1", "827073"
             , "827078", "A2", "827079", "A2"
             , "", "A3");
+    /**
+     *
+     */
     public static Map<String,String> parse(JSONObject sourceData,Map<String,String> fieldSkip){
         StandardEvaluationContext context = new StandardEvaluationContext();
         context.setVariable("M",sourceData);

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/external_system/erp/SyncErpService.java

@@ -177,6 +177,9 @@ public class SyncErpService {
     }
 
 
+    /**
+     *
+     */
     public List<Object> syncData(SyncFormMapping syncFormMapping) {
         List<Object> result = new ArrayList<>();
         try {

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/common/PdaCommonController.java

@@ -54,6 +54,10 @@ public class PdaCommonController {
         return new ResponseEntity<>(TableDataInfo.build(list),HttpStatus.OK);
     }
 
+
+    /**
+     *
+     */
     @PostMapping("/update")
     @Log("获取升级地址")
     @SaIgnore

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

@@ -51,6 +51,9 @@ public class PdaInController {
     }
 
 
+    /**
+     *
+     */
     @GetMapping("/getCertificateInfo/{id}")
     @Log("根据合格证查询物料信息")
     public ResponseEntity<Object> getCertificateInfo(@PathVariable String id) {

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

@@ -71,6 +71,10 @@ public class PdaOutController {
         query.setStatus(new String[]{StatusEnum.FORM_STATUS.code("生成"),StatusEnum.FORM_STATUS.code("执行中")});
         return new ResponseEntity<>(TableDataInfo.build(iPmFormDataService.queryTree(query,page)), HttpStatus.OK);
     }
+
+    /**
+     *
+     */
     @PostMapping("confirm")
     @Log("出库确认")
     @SaIgnore

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

@@ -130,6 +130,9 @@ public class PdaIOService {
         return result;
     }
 
+    /**
+     *
+     */
     private void getOpBills(String id, PmFormData result) throws Exception {
         IdentifyInfo identifyInfo = new IdentifyInfo();
         BeanUtils.copyProperties(erpSec, identifyInfo);

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java

@@ -44,7 +44,9 @@ public interface IPmFormDataService extends IService<PmFormData> {
      * @return
      */
     List<PmFormData> syncAnalyse(SyncFormMapping formMapping, String sourceString);
-
+    /**
+     *
+     */
     Object getSonDtlFormData(String id);
 
     void dynamicSql(String sql);

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java

@@ -150,7 +150,7 @@ public class PmFormData implements Serializable {
     private String prdOrgId;
 
     /**
-     * 货主
+     * 货主1
      */
     @TableField(exist = false)
     private String ownerId;

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java

@@ -73,7 +73,9 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
     }
 
 
-
+    /**
+     *
+     */
     @Override
     public List<PmFormData> syncAnalyse(SyncFormMapping formMapping, String sourceString) {
         try {

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/controller/PickingController.java

@@ -82,7 +82,7 @@ public class PickingController {
     @PostMapping("/updateStatus")
     @Log("修改单据状态")
     public ResponseEntity<Object> updateStatus(@RequestBody JSONObject param) {
-        //TODO:明细校验
+        //TODO:明细校验1
         iPmFormDataService.update(new UpdateWrapper<PmFormData>()
                 .set("status", param.getString("status"))
                 .eq("id", param.getString("id")));

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

@@ -59,7 +59,9 @@ public class SyncErpBillsScheduleService {
         }
 
     }
-
+    /**
+     *
+     */
     public void syncData(SyncFormMapping syncFormMapping) {
         boolean islock = lock.tryLock();
         try {