From 1f34866e4697920d4d9d2c59830b450136393d54 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期二, 14 十一月 2023 08:19:58 +0800
Subject: [PATCH] op170判断
---
guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrdeInfo/controller/ProductionOrdeInfoController.java | 11 +++++++++++
guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/OP170/impl/OP170ServerInterfaceImpl.java | 22 +++++++++++-----------
2 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrdeInfo/controller/ProductionOrdeInfoController.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrdeInfo/controller/ProductionOrdeInfoController.java
index 91095ca..55d15b1 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrdeInfo/controller/ProductionOrdeInfoController.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrdeInfo/controller/ProductionOrdeInfoController.java
@@ -399,6 +399,17 @@
return ResponseData.success(map);
}
+ @ResponseBody
+ @CrossOrigin
+ @RequestMapping("/findOrdrList")
+ public ResponseData findOrdrList(ProductionOrdeInfoParam productionOrdeInfoParam) {
+ ProductionOrdeInfoParam param = new ProductionOrdeInfoParam();
+ param.setProductionLine("");//浜х嚎
+ param.setOrderStatus("3");//宸ュ崟鐘舵��
+ List<ProductionOrdeInfoResult> list = productionOrdeInfoService.findListBySpec(param);
+ return ResponseData.success(list);
+ }
+
/**
* 涓嬭浇excel瀵煎叆妯℃澘
*
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/OP170/impl/OP170ServerInterfaceImpl.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/OP170/impl/OP170ServerInterfaceImpl.java
index 2da2c8a..4b1340e 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/OP170/impl/OP170ServerInterfaceImpl.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/server/OP170/impl/OP170ServerInterfaceImpl.java
@@ -178,19 +178,19 @@
//鏇存柊宸ュ崟瀹屾垚鏁伴噺
ProductionOrdeInfoParam orderParam = new ProductionOrdeInfoParam();
orderParam.setWorkOrderNo(S_ORDER_CODE);
- ProductionOrdeInfoService productionOrdeInfoService = opc.productionOrdeInfoService;
- List<ProductionOrdeInfoResult> list = productionOrdeInfoService.findListBySpec(orderParam);
- if(list.size()>0) {
- ProductionOrdeInfoResult result = list.get(0);
- orderParam.setId(result.getId());
- if (null == result.getActualQty() || "".equals(result.getActualQty())){
- result.setActualQty(0);
+ if(!"".equals(S_ORDER_CODE)&&null!=S_ORDER_CODE){
+ ProductionOrdeInfoService productionOrdeInfoService = opc.productionOrdeInfoService;
+ List<ProductionOrdeInfoResult> list = productionOrdeInfoService.findListBySpec(orderParam);
+ if(list.size()>0) {
+ ProductionOrdeInfoResult result = list.get(0);
+ orderParam.setId(result.getId());
+ if (null == result.getActualQty() || "".equals(result.getActualQty())){
+ result.setActualQty(0);
+ }
+ orderParam.setActualQty(result.getActualQty()+1);
+ productionOrdeInfoService.update(orderParam);
}
- orderParam.setActualQty(result.getActualQty()+1);
- productionOrdeInfoService.update(orderParam);
}
-
-
OPCUnit.write(opc.getOP170_J_PC_FINISH(), "true"); //PC瀹屾垚
logger.info("OP170宸ヤ綅,handleFinsh PC澶勭悊瀹屾垚锛�");
--
Gitblit v1.9.3