From f6e17ebcf5e66b590391e13595968b7e05a7f966 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 28 十月 2025 19:08:22 +0800
Subject: [PATCH] *待判接口开发
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 102 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index a33eb8b..3ea06d8 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.R;
-import com.core.common.SnowflakeIdWorker;
+import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
@@ -80,6 +77,8 @@
private StaDescService staDescService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private RgvOneSignService rgvOneSignService;
@Override
@Transactional
@@ -600,9 +599,10 @@
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
if (Cools.isEmpty(wrkMast)){
throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔′笉瀛樺湪,浠诲姟鍙凤細"+basDevp.getWrkNo());
- }else if (!wrkMast.getWrkSts().equals(52L)){
- throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔＄姸鎬佸凡鍙樻洿锛岃鍕块噸澶嶇敵璇�,浠诲姟鍙凤細"+basDevp.getWrkNo()+",浠诲姟鐘舵��:"+wrkMast.getWrkSts$());
}
+// else if (!wrkMast.getWrkSts().equals(52L)){
+// throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔＄姸鎬佸凡鍙樻洿锛岃鍕块噸澶嶇敵璇�,浠诲姟鍙凤細"+basDevp.getWrkNo()+",浠诲姟鐘舵��:"+wrkMast.getWrkSts$());
+// }
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", basDevp.getWrkNo()));
if (Cools.isEmpty(wrkDetls) || wrkDetls.size()==0){
@@ -634,10 +634,10 @@
// labellerMatParam.setLabellingTime(DateUtils.convert(new Date()));
// labellerMatParam.setLabTemplate("1");
// labellerMatParam.setOrderNo(orderNo);
- wrkMast.setWrkSts(53L);
- if (!wrkMastService.updateById(wrkMast)){
- throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
- }
+// wrkMast.setWrkSts(53L);
+// if (!wrkMastService.updateById(wrkMast)){
+// throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
+// }
return labellerMatParam;
}
@@ -725,12 +725,13 @@
}else if (Cools.isEmpty(matList.getWeight()) || matList.getWeight().equals(0D)){
throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍑�閲� weight涓虹┖");
}else if (Cools.isEmpty(matList.getRoughWeight()) || matList.getRoughWeight().equals(0D)){
- throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細姣涢噸 roughWeight");
+ throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細姣涢噸 roughWeight涓虹┖");
}else if (Cools.isEmpty(matList.getRollExtent()) || matList.getRollExtent().equals(0D)){
- throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗烽暱搴� rollExtent");
- }else if (Cools.isEmpty(matList.getJoint()) || matList.getJoint()==0){
- throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鎺ュご鏁� joint");
+ throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗烽暱搴� rollExtent涓虹┖");
}
+// else if (Cools.isEmpty(matList.getJoint()) || matList.getJoint()==0){
+// throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鎺ュご鏁� joint");
+// }
if (matList.getPosition().equals("1")){//1銆佸乏 2銆佸彸
if (!matnrOne.equals("")){
@@ -780,6 +781,20 @@
throw new CoolException("鎵樼洏鏉＄爜锛�"+param.getBarcode()+"宸插瓨鍦紝璇峰嬁閲嶅缁勬墭");
}
+ try{
+ int rgvOneType = rgvOneSignService.selectCount(new EntityWrapper<RgvOneSign>().eq("rgv_one_type", param.getPalletizingNo() + "barcode" + param.getBarcode()));
+ if (rgvOneType==0){
+ RgvOneSign rgvOneSign = new RgvOneSign();
+ rgvOneSign.setRgvOneSign(param.getPalletizingNo());
+ rgvOneSign.setRgvOneType(param.getPalletizingNo() + "barcode" + param.getBarcode());
+ boolean insert = rgvOneSignService.insert(rgvOneSign);
+ if (!insert){
+ throw new CoolException("鎵樼洏鐮佹爣璁版坊鍔犲け璐ワ紝璇烽噸鏂颁笅鍙戯紒锛侊紒");
+ }
+ }
+ }catch (Exception e){
+ throw new CoolException("鎵樼洏鐮佹爣璁版坊鍔犲紓甯革紝璇烽噸鏂颁笅鍙戯紒锛侊紒");
+ }
Date now = new Date();
for (PalletizingCompleteTwoFloorParam.MatList matList:param.getMatList()){
@@ -802,13 +817,24 @@
waitPakin.sync(mat);
waitPakin.setBatch(matList.getBatch()); //鏈ㄧ缂栫爜 //鎵规 鍞竴鍊� 绠卞彿
waitPakin.setModel(matList.getModel()); //鍗峰彿 鍞竴鍊�
- waitPakin.setBrand(param.getBoxType()); //鏈ㄧ绫诲瀷
+ String boxType = param.getBoxType();
+ try{
+ BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+ BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_specs", boxType));
+ if (!Cools.isEmpty(basBoxType)){
+ boxType = basBoxType.getBoxType();
+ }
+ } catch (Exception e){
+
+ }
+ waitPakin.setBrand(boxType); //鏈ㄧ绫诲瀷
waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮�
waitPakin.setOrigin(matList.getPosition()); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
waitPakin.setWeight(matList.getWeight()); //鍑�閲�
waitPakin.setVolume(matList.getRoughWeight()); //姣涢噸
waitPakin.setPrice(matList.getRollExtent()); //闀垮害
waitPakin.setSpecs(String.valueOf(matList.getJoint())); //鎺ュご
+ waitPakin.setDanger(matList.getQualified()); //寰呭垽
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(matList.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
@@ -819,6 +845,11 @@
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
+
+ RgvOneSign armNo = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","armNo"+param.getPalletizingNo()));
+ armNo.setRgvOneSign(1);
+ rgvOneSignService.updateById(armNo);
+
}
}
@@ -873,6 +904,17 @@
throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
}else if (Cools.isEmpty(param.getMatList()) || param.getMatList().size()==0){
throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
+ }
+
+ if (Cools.isEmpty(param.getBarcode())){
+ throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
+ }
+ WrkMast wrkMastMatrix = wrkMastService.selectByBarcode(param.getBarcode());
+ if (Cools.isEmpty(wrkMastMatrix)){
+ throw new CoolException("鍙傛暟锛氭墭鐩樼爜鏌ヨ宸ヤ綔妗ｅけ璐ワ細"+param.getBarcode());
+ }
+ if (!wrkMastMatrix.getSheetNo().equals("1")){
+ throw new CoolException("鍙傛暟锛氭浠诲姟鏈笂鎶ョ姝㈠畬鎴愶細"+param.getBarcode());
}
ArrayList<WrkDetl> wrkDetlsNew = new ArrayList<>();
@@ -957,8 +999,11 @@
if (Cools.isEmpty(wrkMastMatrix)){
throw new CoolException("鍙傛暟锛氭墭鐩樼爜鏌ヨ宸ヤ綔妗ｅけ璐ワ細"+param.getBarcode());
}
+ if (!wrkMastMatrix.getSheetNo().equals("1")){
+ throw new CoolException("鍙傛暟锛氭浠诲姟鏈笂鎶ョ姝㈠畬鎴愶細"+param.getBarcode());
+ }
- wrkMastMatrix.setSheetNo("2");
+ wrkMastMatrix.setSheetNo("3");
if (!wrkMastService.updateById(wrkMastMatrix)){
throw new CoolException("鏇存柊宸ヤ綔妗ｅけ璐�==銆嬫鏋朵笂浣嶈蒋浠讹細鍗曟墭鎷嗗灈瀹屾垚閫氱煡");
}
@@ -1042,5 +1087,46 @@
return crnStn;
}
+ /*
+ * FQC璐ㄦ
+ * */
+ @Override
+ @Transactional
+ public void qualityInspection(QualityInspectionParam param) {
+ //鍒ゆ柇param鍙傛暟
+ if (Cools.isEmpty(param.getBoxNo())){
+ throw new CoolException("鍙傛暟锛氱鍙� boxNo涓虹┖");
+ }
+
+ List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("batch", param.getBoxNo())
+ .eq("model", param.getModel())
+ );
+ if (locDetlList.isEmpty()){
+ throw new CoolException("鏈煡璇㈠埌瀵瑰簲绠卞彿锛�"+param.getBoxNo()+";涓庡嵎鍙凤細"+param.getModel()+";鐨勭墿鏂�");
+ }
+ for (LocDetl locDetl:locDetlList){
+ if (locDetl.getDanger()!=0){
+ String dangerStr = "";
+ if (locDetl.getDanger()==1){
+ dangerStr = "鍚堟牸";
+ }else if (locDetl.getDanger()==2){
+ dangerStr = "涓嶅悎鏍�";
+ }
+ throw new CoolException("鏌ヨ鍒板搴旂鍙凤細"+param.getBoxNo()+";涓庡嵎鍙凤細"+param.getModel()+";鐨勭墿鏂�,浣嗘槸宸茬粡鏍囪涓�"+dangerStr+"锛屼笉鑳介噸澶嶆爣璁帮紒");
+ }
+ }
+ for (LocDetl locDetl:locDetlList){
+ if (locDetl.getDanger()==0){
+ locDetl.setDanger(param.getDanger());
+ locDetl.setMemo(param.getMemo());
+ locDetlService.update(locDetl,new EntityWrapper<LocDetl>()
+ .eq("loc_no", locDetl.getLocNo())
+ .eq("batch", param.getBoxNo()));
+ }
+ }
+
+ }
+
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
}
--
Gitblit v1.9.1