From a418388d302d3b3a944adc67f60986ea86fc727f Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 14 十一月 2025 10:52:44 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 186 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 175 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 6eba1f6..ca83d92 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -2,25 +2,28 @@
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.R;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.ManLocDetl;
-import com.zy.asrs.entity.Mat;
+import com.core.common.*;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.OrderInspectionRollParam;
+import com.zy.asrs.entity.param.OrderMesXGHYParam;
+import com.zy.asrs.entity.param.QualityGroupListParam;
+import com.zy.asrs.entity.result.OrderPakoutDetailVo;
import com.zy.asrs.mapper.LocDetlMapper;
+import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
+import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -38,6 +41,20 @@
private LocDetlMapper locDetlMapper;
@Autowired
private MatService matService;
+ @Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+
+ @Value("${srXghyMes.qualityFinishedCheckoutUrl}")
+ private String qualityFinishedCheckoutUrl;
+ @Value("${srXghyMes.qualityFinishedCheckout}")
+ private String qualityFinishedCheckout;
+
+ @Value("${srXghyMes.productInventoryUrl}")
+ private String productInventoryUrl;
+ @Value("${srXghyMes.productInventory}")
+ private String productInventory;
@RequestMapping(value = "/locDetl/update")
public R update1() {
@@ -74,6 +91,28 @@
public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
+ if (!Cools.isEmpty(param.get("modi_time"))){
+ String val = String.valueOf(param.get("modi_time"));
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ param.put("startTime", DateUtils.convert(dates[0]));
+ param.put("endTime", DateUtils.convert(dates[1]));
+ param.remove("modi_time");
+ }
+ }
+ Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
+ if (stockOut.getRecords().size()==0){
+ stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
+ }
+ return R.ok(stockOut);
+ }
+
+ @RequestMapping(value = "/unqualified/stock/out/list/auth")
+ @ManagerAuth
+ public R stockOutListUnqualified(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param){
+ param.put("danger",2);
if (!Cools.isEmpty(param.get("modi_time"))){
String val = String.valueOf(param.get("modi_time"));
if (val.contains(RANGE_TIME_LINK)) {
@@ -153,12 +192,18 @@
@RequestMapping(value = "/locDetl/update/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
public R update(LocDetl locDetl){
- if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
+ if (Cools.isEmpty(locDetl) || null==locDetl.getBatch()){
return R.error();
}
- locDetl.setModiUser(getUserId());
- locDetl.setModiTime(new Date());
- locDetlService.updateById(locDetl);
+ LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locDetl.getLocNo()).eq("batch", locDetl.getBatch()));
+ if (Cools.isEmpty(locDetl1) ){
+ return R.error();
+ }
+ locDetl1.setModiUser(getUserId());
+ locDetl1.setModiTime(new Date());
+ locDetl1.setDanger(locDetl.getDanger());
+ locDetlService.update(locDetl1,new EntityWrapper<LocDetl>().eq("loc_no", locDetl.getLocNo()).eq("batch", locDetl.getBatch()));
+// locDetlService.updateById(locDetl1);
return R.ok();
}
@@ -275,4 +320,123 @@
return R.ok(sum);
}
+ @RequestMapping(value = "/actual/shipment/locDetl/report/auth")
+ @ManagerAuth(memo = "鍗峰彿鏄惁鍚堟牸鎵嬪姩鏍￠獙")
+ public R actualShipmentLocDetl(@RequestParam String model) {
+ Long userId = null;
+ try {
+ userId = getUserId();
+ if (Cools.isEmpty(userId)) {
+ return R.error("鐢ㄦ埛寮傚父").add("鐢ㄦ埛寮傚父");
+ }
+ } catch (Exception e){
+ return R.error("鐢ㄦ埛寮傚父").add("鐢ㄦ埛寮傚父");
+ }
+ List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("model", model));
+// OrderInspectionRollParam orderInspectionRollParam = new OrderInspectionRollParam(model);
+ String response = "";
+ boolean success = false;
+ Map<String, Object> params = new HashMap<>();
+ params.put("batchNo", model);
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(qualityFinishedCheckoutUrl)
+ .setPath(qualityFinishedCheckout)
+ .setParams(params)
+ .setUseFormUrlEncoded(true)
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getBoolean("state")) {
+ String value = jsonObject.getString("value");
+ if (value.equals("鍚堟牸")){
+ for (LocDetl locDetl : locDetlList) {
+ locDetl.setDanger(1);
+ locDetlService.updateById(locDetl);
+ }
+ } else if (value.equals("涓嶅悎鏍�")){
+ for (LocDetl locDetl : locDetlList) {
+ locDetl.setDanger(2);
+ locDetlService.updateById(locDetl);
+ }
+ } else {
+ for (LocDetl locDetl : locDetlList) {
+ locDetl.setDanger(0);
+ locDetlService.updateById(locDetl);
+ }
+ }
+ success = true;
+ } else {
+ return R.error("鏌ヨ鍗峰彿鏄惁鍚堟牸澶辫触");
+ }
+ } catch (Exception e) {
+ return R.error("鏌ヨ鍗峰彿鏄惁鍚堟牸澶辫触"+e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鏌ヨ鍗峰彿鏄惁鍚堟牸",
+ qualityFinishedCheckoutUrl+"/"+qualityFinishedCheckout,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(params),
+ response,
+ success
+ );
+ } catch (Exception e) { }
+ }
+ return R.error("涓婃姤澶辫触").add("涓婃姤澶辫触");
+ }
+
+ @RequestMapping(value = "/synchronize/mes/locDetl/report/auth")
+ @ManagerAuth(memo = "鍚屾搴撳瓨鑷矼ES")
+ public R synchronizeLocDetlMes() {
+ try{
+ List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>());
+ if (locDetlList.isEmpty()) {
+ return R.error("搴撳瓨涓虹┖锛侊紒锛�");
+ }
+
+ OrderMesXGHYParam orderMesXGHYParam = new OrderMesXGHYParam(locDetlList,"in","鎴愬搧鍏ュ簱");
+ orderMesXGHYParam.setBarcode(String.valueOf(snowflakeIdWorker.nextId()));
+ orderMesXGHYParam.setPalletizingNo(1);
+
+
+ String response = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(productInventoryUrl)
+ .setPath(productInventory)
+ .setJson(JSON.toJSONString(orderMesXGHYParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getBoolean("state")) {
+ success = true;
+ } else {
+ return R.error("鍚屾搴撳瓨鑷矼ES");
+ }
+ } catch (Exception e) {
+ return R.error("鍚屾搴撳瓨鑷矼ES"+e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鍚屾搴撳瓨鑷矼ES",
+ productInventoryUrl+"/"+productInventory,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(orderMesXGHYParam),
+ response,
+ success
+ );
+ } catch (Exception e) { }
+ }
+ } catch (Exception e) {
+ return R.error("涓婃姤澶辫触"+e.getMessage()).add("涓婃姤澶辫触"+e.getMessage());
+ }
+ return R.error("涓婃姤澶辫触").add("涓婃姤澶辫触");
+ }
+
}
--
Gitblit v1.9.1