WCS功能完善

pang.jiabao

5 天以前 02b0406395a71168cdda9a019874961ff86f5962

WCS功能完善

 src/main/java/com/zy/service/impl/MainServiceImpl.java

@@ -216,7 +216,7 @@
                        && staProtocol.isInEnable()
                        && !staProtocol.isEmptyMk()
                        && staProtocol.isPakMk() && staProtocol.getWorkNo() == 9998) { // 9997空托，9998满托/捡料，9999回退
                    if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
                    if(Cools.isEmpty(barcode) || barcode.endsWith("NG") || "NoRead".equals(barcode) || barcode.startsWith("00000000")) {
                        News.info("{}条码扫描错误：{}",barcodeThread.getSlave().getId(),barcode);
                        continue;
                    }
@@ -254,7 +254,7 @@
                            staProtocol.setStaNo(dto.getStaNo().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            log.error("输送线下发2："+dto.getWorkNo()+","+dto.getStaNo());
                            log.info("输送线下发2："+dto.getWorkNo()+","+dto.getStaNo());
                            if (!result) {
                                News.error(methodName + ":更新plc站点信息失败");
                            }else {
@@ -297,7 +297,7 @@
                }
                String barcode = barcodeThread.getBarcode();
                if(!Cools.isEmpty(barcode)) {
                    if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                    if(barcode.endsWith("NG") || "NoRead".equals(barcode)) {
                        continue;
                    }
                } else {
@@ -1101,7 +1101,7 @@
                        && staProtocol.isPakMk()
                        && staProtocol.getWorkNo() == 9997
                        ) {
                    if (staProtocol.isBarcodeErr() || Cools.isEmpty(barcode) || barcode.startsWith("ERROR") || "NG".endsWith(barcode) || "00000000".equals(barcode)) {
                    if (staProtocol.isBarcodeErr() || Cools.isEmpty(barcode) || barcode.startsWith("ERROR") || barcode.endsWith("NG") || barcode.startsWith("00000000")) {
                        staProtocol.setWorkNo(wrkNo);
                        staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
                        devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -1136,7 +1136,7 @@
                            staProtocol.setStaNo(dto.getStaNo().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            log.error("输送线下发6："+dto.getWorkNo()+","+staProtocol.getSiteId());
                            log.info("输送线下发6："+dto.getWorkNo()+","+staProtocol.getSiteId());
                            if (!result) {
                                News.errorNoLog(""+mark+" - 1"+" - 更新plc站点信息失败");
                                throw new CoolException("SiemensDevp - 5");

 src/main/java/com/zy/service/impl/RcsServiceImpl.java

@@ -37,7 +37,6 @@
import java.net.URL;
import java.net.URLConnection;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -194,7 +193,7 @@
                                    JSONObject jsonObject = new JSONObject();
                                    jsonObject.put("billType", wrkDetl.getThreeCode());
                                    jsonObject.put("orderNo", wrkDetl.getOrderNo());
                                    jsonObject.put("createTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(now));
                                    jsonObject.put("createTime", null);
                                    JSONArray jsonArray = new JSONArray();
                                    for (WrkDetl detl : wrkDetls) {
                                        JSONObject object = new JSONObject();
@@ -203,19 +202,19 @@
                                        jsonArray.add(object);
                                    }
                                    jsonObject.put("details", jsonArray);
                                    String url = DJ_URL + "api/OutboundOrder/WmsOutFinish";
                                    String url = DJ_URL + "/api/OutboundOrder/WmsOutnFinish";
                                    String request = jsonObject.toJSONString();
                                    String response = "";
                                    boolean success = false;
                                    try {
                                        response = new HttpHandler.Builder()
                                                .setUri(DJ_URL)
                                                .setPath("api/OutboundOrder/WmsOutFinish")
                                                .setPath("api/OutboundOrder/WmsOutnFinish")
                                                .setJson(request)
                                                .build()
                                                .doPost();
                                        JSONObject responseJson = JSON.parseObject(response);
                                        if (responseJson.getString("Success").equals("1")) {
                                        if (!Cools.isEmpty(responseJson.getString("code")) && responseJson.getInteger("code")== 200) {
                                            success = true;
                                            log.info("CTU出库反馈end,上报TMS成功,工作号：{}，明细：{}", wrkMast.getWrkNo(), request);
                                        } else {

 src/main/resources/application.yml

@@ -137,7 +137,7 @@
    crnId: 1
# TMS
dj:
  url: http://172.26.11.2/
  url: http://172.26.11.2:8080
#海康对接
hik:
  url: http://172.26.11.98:80/rcs/rtas/