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

add：新增出库异常口放行功能

Browse Source
This commit is contained in:
tuqiang
2025-07-22 15:17:23 +08:00
parent 741789d332
commit 99babf99ac
4 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java
View File

@@ -90,4 +90,12 @@ public class ProductOutTwoController {
return new ResponseEntity<>(productOutTwoService.boxOut(whereJson),HttpStatus.OK); return new ResponseEntity<>(productOutTwoService.boxOut(whereJson),HttpStatus.OK);
} }
@PostMapping("/outExcepionPointPass")
@Log("出库异常口取货点放行")
@SaIgnore
public ResponseEntity<Object> outExcepionPointPass(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(productOutTwoService.outExcepionPointPass(whereJson), HttpStatus.OK);
}
} }

2
lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java
View File

@@ -90,4 +90,6 @@ public interface ProductOutTwoService {
* @return 、 * @return 、
*/ */
JSONObject boxOut(JSONObject whereJson); JSONObject boxOut(JSONObject whereJson);
JSONObject outExcepionPointPass(JSONObject whereJson);
} }

20
lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java
View File

@@ -17,6 +17,7 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.OutBoxMana
import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.pda.st.service.impl.ProductionOutServiceImpl; import org.nl.wms.pda.st.service.impl.ProductionOutServiceImpl;
import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.manage.TaskStatusEnum;
@@ -215,4 +216,23 @@ public class ProductOutTwoServiceImpl implements ProductOutTwoService {
result.put("message", "下发出库成功!"); result.put("message", "下发出库成功!");
return result; return result;
} }
@Override
public JSONObject outExcepionPointPass(JSONObject whereJson) {
WmsToAcsService wmsToAcsService = SpringContextHolder.getBean(WmsToAcsService.class);
JSONArray action_rows = new JSONArray();
JSONObject action_jo = new JSONObject();
String to_command = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("to_command").getValue();
action_jo.put("device_code", whereJson.getString("point_code"));
action_jo.put("code", "to_command");
action_jo.put("product_area", "BLK");
action_jo.put("value", to_command);
action_rows.add(action_jo);
wmsToAcsService.action(action_rows);
JSONObject result = new JSONObject();
result.put("message", "成功放行!");
return result;
}
} }

1
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
View File

@@ -572,7 +572,6 @@ public class BakingServiceImpl implements BakingService {
result.put("message", "操作成功！"); result.put("message", "操作成功！");
return result; return result;
} }
public JSONObject getJsonObject(String product_area, JSONObject point_code2_jo, String temperature) { public JSONObject getJsonObject(String product_area, JSONObject point_code2_jo, String temperature) {
if (ObjectUtil.isEmpty(point_code2_jo)) { if (ObjectUtil.isEmpty(point_code2_jo)) {
throw new BadRequestException("烘箱对接没有可用位置!"); throw new BadRequestException("烘箱对接没有可用位置!");