root/rongLiJiaNai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
18188916393
2022-08-25 17:33:27 +08:00
parent 5014df9aed
commit 0ebda94be5
3 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/outstruct/rest/OutStructController.java
View File

@@ -4,6 +4,7 @@
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
package org.nl.wms.pda.ruleSetting.rest;
=======
package org.nl.wms.pda.outstruct.rest;
@@ -20,6 +21,9 @@ package org.nl.wms.pda.outstruct.rest;
=======
package org.nl.wms.pda.ruleSetting.rest;
>>>>>>> Stashed changes
=======
package org.nl.wms.pda.outstruct.rest;
>>>>>>> Stashed changes
import com.alibaba.fastjson.JSONObject;
@@ -33,6 +37,7 @@ import org.nl.annotation.Log;
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
import org.nl.wms.pda.ruleSetting.service.PdaRuleSettingService;
=======
import org.nl.wms.pda.outstruct.service.OutStructService;
@@ -49,6 +54,9 @@ import org.nl.wms.pda.outstruct.service.OutStructService;
=======
import org.nl.wms.pda.ruleSetting.service.PdaRuleSettingService;
>>>>>>> Stashed changes
=======
import org.nl.wms.pda.outstruct.service.OutStructService;
>>>>>>> Stashed changes
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
@@ -70,6 +78,7 @@ import java.util.Map;
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
=======
>>>>>>> Stashed changes
@RequestMapping("/api/pda/ruleSetting")
@@ -97,6 +106,8 @@ public class PdaRuleSettingController {
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
@RequestMapping("/api/pda/outStruct")
@Slf4j
public class OutStructController {
@@ -118,6 +129,9 @@ public class OutStructController {
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes

6
wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/outstruct/service/OutStructService.java
View File

@@ -3,6 +3,7 @@
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
=======
>>>>>>> Stashed changes
package org.nl.wms.pda.ruleSetting.service;
@@ -24,6 +25,8 @@ public interface PdaRuleSettingService {
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
package org.nl.wms.pda.outstruct.service;
import com.alibaba.fastjson.JSONObject;
@@ -37,6 +40,9 @@ public interface OutStructService {
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes

24
wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/outstruct/service/impl/OutStructServiceImpl.java
View File

@@ -3,6 +3,7 @@
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
package org.nl.wms.pda.ruleSetting.service.impl;
=======
@@ -12,6 +13,8 @@ package org.nl.wms.pda.ruleSetting.service.impl;
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
package org.nl.wms.pda.outstruct.service.impl;
import cn.hutool.core.date.DateUtil;
@@ -19,6 +22,7 @@ import cn.hutool.core.util.IdUtil;
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
@@ -29,6 +33,8 @@ import cn.hutool.core.util.IdUtil;
=======
package org.nl.wms.pda.ruleSetting.service.impl;
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -41,6 +47,7 @@ import lombok.extern.slf4j.Slf4j;
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
=======
>>>>>>> Stashed changes
import org.nl.modules.system.service.UserService;
@@ -59,6 +66,8 @@ import org.springframework.web.bind.annotation.RequestBody;
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
import org.nl.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.utils.SecurityUtils;
@@ -74,6 +83,9 @@ import org.springframework.stereotype.Service;
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
@@ -94,6 +106,7 @@ import java.util.Map;
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
=======
>>>>>>> Stashed changes
public class PdaRuleSettingServiceImpl implements PdaRuleSettingService {
@@ -128,6 +141,8 @@ public class PdaRuleSettingServiceImpl implements PdaRuleSettingService {
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
public class OutStructServiceImpl implements OutStructService {
@Override
@@ -144,6 +159,9 @@ public class OutStructServiceImpl implements OutStructService {
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
@@ -162,6 +180,7 @@ public class OutStructServiceImpl implements OutStructService {
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
=======
>>>>>>> Stashed changes
public Map<String, Object> Confirm( JSONObject param) {
@@ -197,6 +216,8 @@ public class OutStructServiceImpl implements OutStructService {
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
public Map<String, Object> Confirm(JSONObject param) {
@@ -251,6 +272,9 @@ public class OutStructServiceImpl implements OutStructService {
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
<<<<<<< Updated upstream
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes