From 2c58889b757c50a2f74041e9790758b8e46e3a48 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 20 七月 2023 13:35:12 +0800
Subject: [PATCH] #中控：码垛完成下发入库信息 接口实装
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 205 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 200 insertions(+), 5 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 65145a6..3d88baa 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -48,6 +48,14 @@
private TagService tagService;
@Autowired
private TagMapper tagMapper;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private WaitPakinService waitPakinService;
@Override
@Transactional
@@ -543,32 +551,219 @@
}
}
+
+ /*...........................寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐...........................*/
+ /*............................Created by Monkey D. Luffy on 2023.07.19.............................*/
+
+ /*
+ * 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�
+ * */
+ @Override
+ @Transactional
+ public LabellerMatParam labellerMat(LabellerMatParam param){
+ if (Cools.isEmpty(param.getDevNo())){
+ throw new CoolException("鍙傛暟锛氱珯鐐瑰彿 devNo涓虹┖");
+ }else if (Cools.isEmpty(param.getLabNo())){
+ throw new CoolException("鍙傛暟锛氳创鏍囨満鍙� labNo涓虹┖");
+ }
+ BasDevp basDevp = basDevpService.selectById(param.getDevNo());
+ if (Cools.isEmpty(basDevp)){
+ throw new CoolException("鍙傛暟锛氱珯鐐瑰彿 devNo涓嶅瓨鍦�");
+ }else if (Cools.isEmpty(basDevp.getWrkNo()) || basDevp.getWrkNo()==0){
+ throw new CoolException("绔欑偣:"+param.getDevNo()+" 涓嶅瓨鍦ㄥ伐浣滀腑浠诲姟");
+ }
+
+ 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$());
+ }
+
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", basDevp.getWrkNo()));
+ if (Cools.isEmpty(wrkDetls) || wrkDetls.size()==0){
+ throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔′笉瀛樺湪浠诲姟鏄庣粏,浠诲姟鍙凤細"+basDevp.getWrkNo());
+ }
+
+ LabellerMatParam labellerMatParam = new LabellerMatParam();
+ labellerMatParam.setDevNo(param.getDevNo());
+ labellerMatParam.setLabNo(param.getLabNo());
+ ArrayList<LabellerMatParam.CombMat> combMats = new ArrayList<>();
+ String orderNo = "";
+
+ for (WrkDetl wrkDetl:wrkDetls){
+ LabellerMatParam.CombMat combMat = new LabellerMatParam.CombMat(wrkDetl);
+ orderNo=wrkDetl.getOrderNo();
+ combMat.setTemp1("1");
+ combMats.add(combMat);
+ }
+
+ labellerMatParam.setCombMats(combMats);
+ labellerMatParam.setLabellingTime(DateUtils.convert(new Date()));
+ labellerMatParam.setWrkNo(basDevp.getWrkNo().toString());
+ labellerMatParam.setLabTemplate("1");
+ labellerMatParam.setOrderNo(orderNo);
+ wrkMast.setWrkSts(53L);
+ if (!wrkMastService.updateById(wrkMast)){
+ throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
+ }
+ return labellerMatParam;
+ }
+
+ /*
+ * 璐存爣鏈鸿创鏍囧畬鎴�
+ * */
@Override
@Transactional
public void labellerComplete(LabellerCompleteParam param) {
+ if (Cools.isEmpty(param.getDevNo())){
+ throw new CoolException("鍙傛暟锛氱珯鐐瑰彿 devNo涓虹┖");
+ }else if (Cools.isEmpty(param.getLabNo())){
+ throw new CoolException("鍙傛暟锛氳创鏍囨満鍙� labNo涓虹┖");
+ }else if (Cools.isEmpty(param.getLabResult())){
+ throw new CoolException("鍙傛暟锛氳创鏍囩粨鏋� labResult涓虹┖");
+ }else if (Cools.isEmpty(param.getWrkNo())){
+ throw new CoolException("鍙傛暟锛氳创鏍囦换鍔″彿 wrkNo涓虹┖");
+ }
+ BasDevp basDevp = basDevpService.selectById(param.getDevNo());
+ if (Cools.isEmpty(basDevp)){
+ throw new CoolException("鍙傛暟锛氱珯鐐瑰彿 devNo="+param.getDevNo()+"涓嶅瓨鍦�");
+ }else if (Cools.isEmpty(basDevp.getWrkNo()) || basDevp.getWrkNo()==0 ){
+ throw new CoolException("绔欑偣:"+param.getDevNo()+" 涓嶅瓨鍦ㄥ伐浣滀腑浠诲姟");
+ }else if(!basDevp.getWrkNo().toString().equals(param.getWrkNo())){
+ throw new CoolException("绔欑偣:"+param.getDevNo()+" 杩涜涓换鍔″彿="+basDevp.getWrkNo()+" 涓庤创鏍囩粨鏋滆繑鍥炰换鍔″彿="+param.getWrkNo()+" 涓嶄竴鑷�");
+ }
+ 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(53L)){
+ throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔＄姸鎬佸凡鍙樻洿锛岃鍕块噸澶嶇敵璇�,浠诲姟鍙凤細"+basDevp.getWrkNo()+",浠诲姟鐘舵��:"+wrkMast.getWrkSts$());
+ }
+
+ if (param.getLabResult().equals("OK")){
+ wrkMast.setWrkSts(54L);
+ if (!wrkMastService.updateById(wrkMast)){
+ throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
+ }
+ }else if (param.getLabResult().equals("NG")){
+ wrkMast.setWrkSts(52L);
+ if (!wrkMastService.updateById(wrkMast)){
+ throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
+ }
+ }else {
+ throw new CoolException("鍙傛暟锛氳创鏍囩粨鏋�:labResult"+param.getLabResult()+";璇锋寜瑙勫垯鍙戦�侊細鎴愬姛锛歄K 銆佸け璐�:NG");
+ }
}
- @Override
- @Transactional
- public void labellerMat(LabellerMatParam param){
- }
+ /*
+ * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ * */
@Override
@Transactional
public void palletizingComplete(PalletizingCompleteParam param) {
+ Long userId = 7777L;//涓帶
+ //鍒ゆ柇param鍙傛暟
+ if (Cools.isEmpty(param.getBarcode())){
+ throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
+ }else if (Cools.isEmpty(param.getPalletizingNo())){
+ throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
+ }else if (Cools.isEmpty(param.getMatLists()) || param.getMatLists().size()==0){
+ throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
+ }
+ //鍒ゆ柇matLists鍙傛暟
+ for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
+ if (Cools.isEmpty(matList.getMatnr())){
+ throw new CoolException("鍙傛暟锛氱墿鏂欑紪鐮� matnr涓虹┖");
+ }else if (Cools.isEmpty(matList.getPosition())){
+ throw new CoolException("鐗╂枡缂栫爜锛�"+matList.getMatnr()+"銆佸弬鏁帮細鐮佸灈浣嶇疆 position涓虹┖");
+ }else if (Cools.isEmpty(matList.getBoxNo())){
+ throw new CoolException("鐗╂枡缂栫爜锛�"+matList.getMatnr()+"銆佸弬鏁帮細鏈ㄧ缂栧彿 boxNo涓虹┖");
+ }else if (Cools.isEmpty(matList.getAnfme()) || matList.getAnfme().equals(0)){
+ throw new CoolException("鐗╂枡缂栫爜锛�"+matList.getMatnr()+"銆佸弬鏁帮細鏈ㄧ涓摐绠旀暟閲� anfme涓虹┖");
+ }else if (Cools.isEmpty(matList.getWeight()) || matList.getWeight().equals(0D)){
+ throw new CoolException("鐗╂枡缂栫爜锛�"+matList.getMatnr()+"銆佸弬鏁帮細閲嶉噺 weight涓虹┖");
+ }
+ }
+
+// BasDevp basDevp = basDevpService.selectById(Integer.parseInt(param.getDevNo$()));
+// if (Cools.isEmpty(basDevp)){
+// throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo="+param.getPalletizingNo()+"涓嶅瓨鍦�");
+// }
+// if (Cools.isEmpty(basDevp.getAutoing()) || !basDevp.getAutoing().equals("Y")){
+// throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getPalletizingNo()+" 鎵�澶勭珯鐐逛笉鏄嚜鍔ㄧ姸鎬�");
+// }
+// if (Cools.isEmpty(basDevp.getLoading()) || !basDevp.getLoading().equals("Y")){
+// throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getPalletizingNo()+" 鎵�澶勭珯鐐逛笉鏄湁鐗╃姸鎬�");
+// }
+// if (Cools.isEmpty(basDevp.getCanining()) || !basDevp.getCanining().equals("Y")){
+// throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getPalletizingNo()+" 鎵�澶勭珯鐐逛笉鏄兘鍏ョ姸鎬�");
+// }
+
+
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type",201).eq("barcode", param.getBarcode()).eq("sta_no",param.getDevNo$()));
+ if (Cools.isEmpty(wrkMast) || !wrkMast.getWrkSts().equals(42L)){
+ throw new CoolException("鏌ヨ鎵樼洏澶辫触");
+ }else {
+ wrkMast.setWrkSts(wrkMast.getWrkSts()+1);
+ }
+
+
+ if (locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()))!=0
+ || wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()))!=0
+ || waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()))!=0){
+ throw new CoolException("鎵樼洏鏉＄爜锛�"+param.getBarcode()+"宸插瓨鍦紝璇峰嬁閲嶅缁勬墭");
+ }
+
+
+ Date now = new Date();
+ for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
+ Mat mat = matService.selectByMatnr(matList.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(matList.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.sync(mat);
+ waitPakin.setBatch(matList.getBatch()); //鎵规
+ waitPakin.setSpecs(matList.getSpecs()); //瑙勬牸
+ waitPakin.setSku(matList.getBoxNo()); //鏈ㄧ缂栫爜
+ waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮�
+ waitPakin.setOrigin(matList.getPosition()); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(matList.getAnfme().doubleValue()); // 鏈ㄧ涓摐绠旀暟閲�
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAppeUser(userId);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(userId);
+ waitPakin.setModiTime(now);
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ }
+ if (!wrkMastService.updateById(wrkMast)){
+ throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
+ }
}
+
+ /*
+ * 妗佹灦涓婁綅杞欢锛氬崟娆℃媶鍨涘畬鎴愰�氱煡
+ * */
@Override
@Transactional
public void singleUnstackingComplete(SingleUnstackingCompleteParam param) {
}
+
+ /*
+ * 妗佹灦涓婁綅杞欢锛氬崟鎵樻媶鍨涘畬鎴愰�氱煡
+ * */
@Override
@Transactional
public void singleMountUnstackingComplete(SingleMountUnstackingCompleteParam param) {
}
-
+ /*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
}
--
Gitblit v1.9.1