代码规范更新

lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java

@@ -20,8 +20,6 @@ import java.util.HashMap;
 @RequiredArgsConstructor
 @Slf4j
 public class CrmToLmsServiceImpl implements CrmToLmsService {
-
-
     @Override
     public JSONObject getCustomerInfo(JSONObject row) {
 
@@ -194,11 +192,9 @@ public class CrmToLmsServiceImpl implements CrmToLmsService {
         if (StrUtil.isNotEmpty(thickness_request)) {
             map.put("thickness_request", thickness_request);
         }
-
         //将查询条件带入，查询LMS成品库库存信息
         JSONArray rows = WQL.getWO("QCRM_001").addParamMap(map).addParam("flag", "1").process().getResultJSONArray(0);
         
-
         JSONObject result = new JSONObject();
         result.put("RTYPE", "S");
         result.put("RTMSG", "操作成功!");

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java

@@ -9,17 +9,13 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.modules.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.modules.wql.WQL;
+import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.system.service.user.ISysUserService;
-import org.nl.system.service.user.dao.SysUser;
-import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl;
 import org.nl.wms.st.inbill.service.StorPublicService;
 import org.nl.wms.st.returns.service.impl.InAndOutRetrunServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -220,17 +216,11 @@ public class InbillServiceImpl {
             param.put("rows", rows);
             try {
                 bean.uploadMES(param);
-
-
             } catch (Exception e) {
-                System.out.println(e.getMessage());
                 log.info(e.getMessage());
             } finally {
                 WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo);
             }
         }
-
-
-        //回传SAP
     }
 }

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java

@@ -4730,7 +4730,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
 
                 try {
                     // 调用接口回传
-                    System.out.println(paramMst.toString());
                     new LmsToSapServiceImpl().returnMoveDtl(paramMst);
                 } catch (Exception e) {
                     throw new BadRequestException("回传sap失败："+e.getMessage());
@@ -4765,8 +4764,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
 
         // 调用出库任务类下发任务
         new OutTask().immediateNotifyAcs(jsonTask.getString("task_id"));
-//        List<AcsTaskDto> acsTaskDtos = new OutTask().addTask();
-//        System.out.println(acsTaskDtos.toString());
 
         // 更新任务状态为下发
         jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode());

lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java

@@ -25,8 +25,6 @@ import org.nl.wms.ext.sap.service.impl.LmsToSapServiceImpl;
 import org.nl.wms.st.returns.service.InAndOutReturnService;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.TransactionTemplate;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -39,8 +37,6 @@ import java.util.*;
 @RequiredArgsConstructor
 @Slf4j
 public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
-    private final TransactionTemplate transactionTemplate;
-
     private final ISysUserService iSysUserService;
 
 
@@ -235,9 +231,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                     paramMesMst.put("iOutboundUser", jo_mst.getString("confirm_optname"));
                     paramMesMst.put("iOutboundTime", DateUtil.now());
 
-                    JSONArray boxArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "2")
+                    JSONArray boxArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0);
-                            .addParam("iostorinv_id", jo_mst.getString("iostorinv_id"))
-                            .process().getResultJSONArray(0);
 
                     JSONArray paramArr = new JSONArray();
                     for (int j = 0; j < boxArr.size(); j++) {
@@ -275,9 +269,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                     paramMesMst.put("iOutboundUser", jo_mst.getString("confirm_optname"));
                     paramMesMst.put("iOutboundTime", DateUtil.now());
 
-                    JSONArray boxArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "2")
+                    JSONArray boxArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0);
-                            .addParam("iostorinv_id", jo_mst.getString("iostorinv_id"))
-                            .process().getResultJSONArray(0);
 
                     JSONArray paramArr = new JSONArray();
                     for (int j = 0; j < boxArr.size(); j++) {
@@ -441,7 +433,6 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
 
                     JSONObject param = new JSONObject();
                     param.put("HEAD", paramSapMstArr);
-//                    System.out.println(param.toString());
 
                     // 调用接口回传
                     new LmsToSapServiceImpl().returnDelivery(param);
@@ -564,7 +555,6 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
 
                             JSONObject jsonSect = sectTab.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0);
                             if (ObjectUtil.isNotEmpty(jsonSect)) {
-                                //jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点
                                 jsonDtl.put("LGORT", lgort); // 明細储存地点
                             }
 
@@ -588,7 +578,6 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
 
                     JSONObject param = new JSONObject();
                     param.put("HEAD", paramSapMstArr);
-                    System.out.println(param.toString());
 
                     // 调用接口回传
                     new LmsToSapServiceImpl().returnDelivery(param);
@@ -708,7 +697,6 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                     paramMst.put("T_ITEM", paramArr);
 
                     // 调用接口回传
-                    System.out.println(paramMst.toString());
                     new LmsToSapServiceImpl().returnMoveDtl(paramMst);
 
                     jo_mst.put("upload_sap", "1");
@@ -960,8 +948,6 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
 
                 JSONObject param = new JSONObject();
                 param.put("HEAD", paramSapMstArr);
-//                    System.out.println(param.toString());
-
                 // 调用接口回传
                 new LmsToSapServiceImpl().returnDelivery(param);
 
@@ -1003,7 +989,6 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                     paramSapMstArr.add(paramDis);
                 }
                 param.put("ITEM", paramSapMstArr);
-                System.out.println(param.toString());
 
                 //查询该调拨入库单对应的出库单
                 JSONObject out_mst = wo_mst.query("source_id = '" + jo_mst.getString("source_id") + "' AND io_type = '1' AND is_delete = '0'").uniqueResult(0);
@@ -1189,7 +1174,6 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
 
                         JSONObject jsonSect = sectTab.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0);
                         if (ObjectUtil.isNotEmpty(jsonSect)) {
-                            //jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点
                             jsonDtl.put("LGORT", lgort); // 明細储存地点
                         }
 
@@ -1213,7 +1197,6 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
 
                 JSONObject param = new JSONObject();
                 param.put("HEAD", paramSapMstArr);
-                System.out.println(param.toString());
 
                 // 调用接口回传
                 new LmsToSapServiceImpl().returnDelivery(param);
@@ -1234,9 +1217,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                 paramMesMst.put("iOutboundUser", jo_mst.getString("confirm_optname"));
                 paramMesMst.put("iOutboundTime", DateUtil.now());
 
-                JSONArray boxArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "2")
+                JSONArray boxArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0);
-                        .addParam("iostorinv_id", jo_mst.getString("iostorinv_id"))
-                        .process().getResultJSONArray(0);
 
                 JSONArray paramArr = new JSONArray();
                 for (int j = 0; j < boxArr.size(); j++) {
@@ -1326,9 +1307,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                 paramMesMst.put("iOutboundUser", jo_mst.getString("confirm_optname"));
                 paramMesMst.put("iOutboundTime", DateUtil.now());
 
-                JSONArray boxArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "2")
+                JSONArray boxArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0);
-                        .addParam("iostorinv_id", jo_mst.getString("iostorinv_id"))
-                        .process().getResultJSONArray(0);
 
                 JSONArray paramArr = new JSONArray();
                 for (int j = 0; j < boxArr.size(); j++) {