Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 35bc2d24 由 zshaohui
选项

1.出入库通知mes地址修改 

2.对接接料机修改
1 个父辈 7a31efad
内嵌 并排
正在显示 4 个修改的文件 包含 19 行增加 和 14 行删除
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
...@@ -668,19 +668,23 @@ public class LiteOrderCache { ...@@ -668,19 +668,23 @@ public class LiteOrderCache {
String model = orderItem.getModel(); String model = orderItem.getModel();
if (StringUtils.isEmpty(model)) { if (StringUtils.isEmpty(model)) {
//C02-3FSMT-18,C02-3FSMT-19,C02-3FSMT-09,C02-3FSMT-08 //C02-3FSMT-18,C02-3FSMT-19,C02-3FSMT-09,C02-3FSMT-08
if ("C02-3FSMT-18".equals(cacheOrder.getLine()) String orderLine = cacheOrder.getLine();
|| "C02-3FSMT-19".equals(cacheOrder.getLine()) if (StringUtils.isNotEmpty(orderLine)) {
|| "C02-3FSMT-08".equals(cacheOrder.getLine()) if (orderLine.startsWith("C02-3FSMT-18") ||
|| "C02-3FSMT-09".equals(cacheOrder.getLine()) orderLine.startsWith("C02-3FSMT-19") ||
) { orderLine.startsWith("C02-3FSMT-08") ||
model = "X8"; orderLine.startsWith("C02-3FSMT-09")) {
model = "X8";
} else {
model = "EVEREST";
}
} else { } else {
model = "EVEREST"; model = "EVEREST";
} }
} }
//如果是迈征工单,不是满料,不出库 //如果是迈征工单,不是满料,不出库
if (cacheOrder.isMaiZheng()){ /*if (cacheOrder.isMaiZheng()){
Barcode barcode = pos.getBarcode(); Barcode barcode = pos.getBarcode();
BrandQtyResult result = lizhenApi.brandQty(new BrandQtyRequest(barcode.getPartNumber(), barcode.getProvider())); BrandQtyResult result = lizhenApi.brandQty(new BrandQtyRequest(barcode.getPartNumber(), barcode.getProvider()));
int qty = result.getQty(); int qty = result.getQty();
...@@ -688,7 +692,7 @@ public class LiteOrderCache { ...@@ -688,7 +692,7 @@ public class LiteOrderCache {
if (qty != barcode.getAmount()){ if (qty != barcode.getAmount()){
throw new ValidateException("",barcode.getBarcode()+"不是满卷数量,不允许出库"); throw new ValidateException("",barcode.getBarcode()+"不是满卷数量,不允许出库");
} }
} }*/
List<String> batchCheckReel = lizhenApi.batchCheckReel(Arrays.asList(pos.getBarcode()), "",model); List<String> batchCheckReel = lizhenApi.batchCheckReel(Arrays.asList(pos.getBarcode()), "",model);
if (batchCheckReel != null && !batchCheckReel.isEmpty()){ if (batchCheckReel != null && !batchCheckReel.isEmpty()){
......
src/main/java/com/neotel/smfcore/custom/lizhen/third/maicheng/controller/MaiZhengController.java
...@@ -150,6 +150,7 @@ public class MaiZhengController { ...@@ -150,6 +150,7 @@ public class MaiZhengController {
liteOrder.setCount(askReelBox.getCount()); liteOrder.setCount(askReelBox.getCount());
liteOrder.setStartTime(askReelBox.getStartTime()); liteOrder.setStartTime(askReelBox.getStartTime());
liteOrder.setMaiZheng(true); liteOrder.setMaiZheng(true);
liteOrder.setServerId(askReelBox.getServerId());
liteOrder = liteOrderManager.save(liteOrder); liteOrder = liteOrderManager.save(liteOrder);
......
src/main/resources/config/application-21088prod.yml
...@@ -14,11 +14,11 @@ api: ...@@ -14,11 +14,11 @@ api:
barcodeInfoUrl: http://10.68.25.42:8001/Sct/GetReelInfo barcodeInfoUrl: http://10.68.25.42:8001/Sct/GetReelInfo
#入库 #入库
save2DReelInfoUrl: http://10.68.27.68:8002/SmtAutoWH/Save2DReelInfo save2DReelInfoUrl: http://10.68.25.40:8002/SmtAutoWH/Save2DReelInfo
#发料 #发料
commonGIRecordUrl: http://10.68.27.68:8002/Sct/CommonGIRecord commonGIRecordUrl: http://10.68.25.40:8002/Sct/CommonGIRecord
#退料 #退料
commonRMRecordUrl: http://10.68.27.68:8002/Sct/CommonRMRecord commonRMRecordUrl: http://10.68.25.40:8002/Sct/CommonRMRecord
#获取有限期 #获取有限期
getInDateUrl: http://10.68.30.22:8082/api/mes/GetInDate getInDateUrl: http://10.68.30.22:8082/api/mes/GetInDate
#散料是否量测 #散料是否量测
......
src/main/resources/config/application-21088test.yml
...@@ -15,11 +15,11 @@ api: ...@@ -15,11 +15,11 @@ api:
barcodeInfoUrl: http://10.68.25.42:8001/Sct/GetReelInfo barcodeInfoUrl: http://10.68.25.42:8001/Sct/GetReelInfo
#入库 #入库
save2DReelInfoUrl: http://10.68.27.68:8002/SmtAutoWH/Save2DReelInfo save2DReelInfoUrl: http://10.68.25.40:8002/SmtAutoWH/Save2DReelInfo
#发料 #发料
commonGIRecordUrl: http://10.68.27.68:8002/Sct/CommonGIRecord commonGIRecordUrl: http://10.68.25.40:8002/Sct/CommonGIRecord
#退料 #退料
commonRMRecordUrl: http://10.68.27.68:8002/Sct/CommonRMRecord commonRMRecordUrl: http://10.68.25.40:8002/Sct/CommonRMRecord
#获取有限期 #获取有限期
getInDateUrl: http://10.42.220.171:8082/api/mes/GetInDate getInDateUrl: http://10.42.220.171:8082/api/mes/GetInDate
#散料是否量测 #散料是否量测
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!