From 0dba85880e21d1a42fd2667590b5168c54bdc7e9 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 14 八月 2024 10:40:46 +0800
Subject: [PATCH] 成品入库和界面显示
---
src/main/java/com/zy/asrs/task/handler/GhjtHandler.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java b/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
index 278e8c1..839bd1e 100644
--- a/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
@@ -1,13 +1,16 @@
package com.zy.asrs.task.handler;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.WrkDetlService;
import com.zy.common.constant.MesConstant;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
@@ -17,7 +20,9 @@
import javax.annotation.Resource;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author pang.jiabao
@@ -37,6 +42,9 @@
@Resource
private WrkMastMapper wrkMastMapper;
+ @Resource
+ private WrkDetlService wrkDetlService;
+
@Transactional
public void startCkrwPushGwcs(WrkMast wrkMast) {
@@ -44,25 +52,33 @@
Map<String, Object> headers = new HashMap<>();
headers.put("Content-Type", "application/json;charset=UTF-8");
+ // 涓嬪彂缁檊wcs瑕佽蛋鐨勮矾寰勬爣璇�
+ int descFlag = getDescToGwcs(wrkMast);
+
// 鏋勯�犺姹備綋
JSONObject jsonObject = new JSONObject();
jsonObject.put("workNo", wrkMast.getWrkNo());
jsonObject.put("staNo", wrkMast.getStaNo());
+ jsonObject.put("barcode", wrkMast.getBarcode());
jsonObject.put("sourceStaNo", wrkMast.getSourceStaNo());
+ jsonObject.put("descFlag", descFlag); // 101鍑哄簱鏃剁敤锛�0鍙湁涓�鏉¤矾寰勶紝1鐞嗚揣璐存爣璺緞锛�2璐存爣鎵撳甫璺緞
String body = jsonObject.toJSONString();
boolean success = false;
String response = "";
try {
response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PAKIN_URL)
+ .setUri(MesConstant.GWCS_IP_PORT)
+ .setPath(MesConstant.GWCS_DCKK_URL)
.setHeaders(headers)
.setJson(body)
.build()
.doPost();
if (!Cools.isEmpty(response)) {
wrkMast.setWrkSts(2L); // 鏇存柊涓鸿澶囦笂璧�
+ if (wrkMast.getIoType() == 110) { // 绌烘墭鐩樺嚭搴撶洿鎺ュ畬鎴愪换鍔�
+ wrkMast.setWrkSts(14L);
+ }
wrkMastMapper.updateById(wrkMast);
success = true;
} else {
@@ -89,6 +105,30 @@
}
}
+ /**
+ * 鍏ㄦ澘鍑哄簱鍒�3077鎴�3106鐨勪换鍔★紝鍒ゆ柇鍑哄簱瑕佽蛋鐨勮矾寰�
+ * @param wrkMast 宸ヤ綔涓绘。
+ * @return 0.鍙湁涓�鏉¤矾寰勶紝1.鐞嗚揣璐存爣鍑哄簱璺緞锛�2.璐存爣鎵撳甫鍑哄簱璺緞
+ */
+ private int getDescToGwcs(WrkMast wrkMast) {
+ int flag = 0;
+ if (wrkMast.getIoType() == 101 && (wrkMast.getStaNo() == 3077 || wrkMast.getStaNo() == 3106)) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ // 鍑虹殑鐗╂枡鏈夊嚑涓綅缃�
+ List<String> collect = wrkDetls.stream().map(WrkDetl::getOrigin).distinct().collect(Collectors.toList());
+ if (collect.size() == 1) { // 涓�绠�
+ if (wrkDetls.size() == 1) { // 涓�鍗峰幓璐存爣
+ flag = 1;
+ } else { // 澶氬嵎鐩存帴鍑�
+
+ }
+ } else if(collect.size() == 2) { // 涓ょ鍘昏创鏍囨墦甯�
+ flag = 2;
+ }
+ }
+ return flag;
+ }
+
@Transactional
public void OutBoundCompleteReport(Order order) {
--
Gitblit v1.9.1