From 38e180b50cfc86764b8d12872b90af72d6a96083 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 28 十月 2025 19:20:03 +0800
Subject: [PATCH] *待判接口开发
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 449 +++++++++++++++++++++----------------------------------
1 files changed, 175 insertions(+), 274 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 dec99b3..95f3b9b 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;
}
@@ -694,7 +694,7 @@
* */
@Override
@Transactional
- public void palletizingComplete(PalletizingCompleteParam param) {
+ public void PalletizingCompleteTwoFloorParam(PalletizingCompleteTwoFloorParam param) {
Long userId = 7777L;//涓帶
//鍒ゆ柇param鍙傛暟
if (Cools.isEmpty(param.getBarcode())){
@@ -703,36 +703,60 @@
throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
}else if (Cools.isEmpty(param.getBoxType())){
throw new CoolException("鍙傛暟锛氭湪绠辩被鍨� boxType涓虹┖");
- }else if (Cools.isEmpty(param.getMatLists()) || param.getMatLists().size()==0){
+ }else if (Cools.isEmpty(param.getMatList()) || param.getMatList().size()==0){
throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
}
- ArrayList<String> positions = new ArrayList<>(); //鏈ㄧ浣嶇疆鏌ラ噸 (orgin)
+ String matnrOne = "";//鏈ㄧ鐩稿悓浣嶇疆 瑙勬牸 matnr鏍￠獙 1銆佸乏
+ String matnrTwo = "";//鏈ㄧ鐩稿悓浣嶇疆 瑙勬牸 matnr鏍￠獙 2銆佸彸
ArrayList<String> boxNos = new ArrayList<>(); //鏈ㄧ鍞竴缂栫爜鏌ラ噸 锛坆atch锛�
//鍒ゆ柇matLists鍙傛暟
- for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
+ for (PalletizingCompleteTwoFloorParam.MatList matList:param.getMatList()){
if (Cools.isEmpty(matList.getMatnr())){
- throw new CoolException("鍙傛暟锛氱墿鏂欑紪鐮� matnr涓虹┖");
+ 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涓虹┖");
+ throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鐮佸灈浣嶇疆 position涓虹┖");
+ }else if (Cools.isEmpty(matList.getBatch())){
+ throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鏈ㄧ缂栧彿 batch涓虹┖");
+ }else if (Cools.isEmpty(matList.getModel())){
+ throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗峰彿 model涓虹┖");
+ }else if (Cools.isEmpty(matList.getBatch())){
+ throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鏈ㄧ缂栧彿 boxNo涓虹┖");
}else if (Cools.isEmpty(matList.getWeight()) || matList.getWeight().equals(0D)){
- throw new CoolException("鐗╂枡缂栫爜锛�"+matList.getMatnr()+"銆佸弬鏁帮細閲嶉噺 weight涓虹┖");
+ throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍑�閲� weight涓虹┖");
+ }else if (Cools.isEmpty(matList.getRoughWeight()) || matList.getRoughWeight().equals(0D)){
+ 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");
+// }
+
+ if (matList.getPosition().equals("1")){//1銆佸乏 2銆佸彸
+ if (!matnrOne.equals("")){
+ if (!matnrOne.equals(matList.getMatnr())){
+ throw new CoolException("鏈ㄧ浣嶇疆锛�"+matList.getPosition()+"瀛樺湪涓嶅悓瑙勬牸鍗蜂俊鎭�");
+ }
+ }else {
+ matnrOne=matList.getMatnr();
+ }
+ }else if (matList.getPosition().equals("2")){
+ if (!matnrTwo.equals("")){
+ if (!matnrTwo.equals(matList.getMatnr())){
+ throw new CoolException("鏈ㄧ浣嶇疆锛�"+matList.getPosition()+"瀛樺湪涓嶅悓瑙勬牸鍗蜂俊鎭�");
+ }
+ }else {
+ matnrTwo=matList.getMatnr();
+ }
+ }else {
+ throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBatch()+",鏈ㄧ浣嶇疆閿欒锛�"+matList.getPosition());
}
- if (!positions.contains(matList.getPosition())){
- positions.add(matList.getPosition());
+ if (!boxNos.contains(matList.getBatch())){
+ boxNos.add(matList.getBatch());
}else {
- throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBoxNo()+",鏈ㄧ浣嶇疆瀛樺湪閲嶅锛�"+matList.getPosition());
- }
-
- if (!boxNos.contains(matList.getBoxNo())){
- boxNos.add(matList.getBoxNo());
- }else {
- throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBoxNo()+",鏈ㄧ缂栫爜瀛樺湪閲嶅");
+ throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBatch()+",鏈ㄧ缂栫爜瀛樺湪閲嶅");
}
}
@@ -757,42 +781,75 @@
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 (PalletizingCompleteParam.MatList matList:param.getMatLists()){
- long rollUp = new Date().getTime();
+ for (PalletizingCompleteTwoFloorParam.MatList matList:param.getMatList()){
Mat mat = matService.selectByMatnr(matList.getMatnr());
if (Cools.isEmpty(mat)) {
- throw new CoolException(matList.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ mat = new Mat();
+ mat.setMatnr(matList.getMatnr());
+ mat.setMaktx(matList.getMatnr());
+ mat.setTagId(tagService.getTop().getId());
+ mat.setCreateBy(userId);
+ mat.setCreateTime(now);
+ mat.setUpdateBy(userId);
+ mat.setUpdateTime(now);
+ mat.setStatus(1);
+ if (!matService.insert(mat)) {
+ throw new CoolException("瑙勬牸娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
- waitPakin.setModel(matList.getBatch()); //鎵规
- waitPakin.setSpecs(matList.getSpecs()); //瑙勬牸
- waitPakin.setBatch(matList.getBoxNo()); //鏈ㄧ缂栫爜
- waitPakin.setBrand(param.getBoxType()); //鏈ㄧ绫诲瀷
+ waitPakin.setBatch(matList.getBatch()); //鏈ㄧ缂栫爜 //鎵规 鍞竴鍊� 绠卞彿
+ waitPakin.setModel(matList.getModel()); //鍗峰彿 鍞竴鍊�
+ 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().doubleValue()); // 鏈ㄧ涓摐绠旀暟閲�
+ waitPakin.setAnfme(matList.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
waitPakin.setAppeUser(userId);
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
- waitPakin.setRollUp(rollUp);
- if (!Cools.isEmpty(matList.getMatDetlList())){
- for (PalletizingCompleteParam.MatDetlList matDetlList:matList.getMatDetlList()){
- LocDetlRullUpDetail locDetlRullUpDetail = new LocDetlRullUpDetail();
- locDetlRullUpDetail.setUuid(rollUp);
- locDetlRullUpDetail.setRollNo(matDetlList.getBoxNoDetl());
- locDetlRullUpDetail.setRollWeight(matDetlList.getWeightDetl().toString());
- locDetlRullUpDetailService.insert(locDetlRullUpDetail);
- }
- }
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);
+
}
}
@@ -803,165 +860,18 @@
@Override
@Transactional
public void palletizingCompleteS(PalletizingCompleteParam param) {
- Long userId = 7776L;//鏉剧洓
//鍒ゆ柇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.getBoxType())){
- throw new CoolException("鍙傛暟锛氭湪绠辩被鍨� boxType涓虹┖");
- }else if (Cools.isEmpty(param.getMatLists()) || param.getMatLists().size()!=1){
- throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
}
- ArrayList<String> positions = new ArrayList<>(); //鏈ㄧ浣嶇疆鏌ラ噸 (orgin)
- ArrayList<String> boxNos = new ArrayList<>(); //鏈ㄧ鍞竴缂栫爜鏌ラ噸 锛坆atch锛�
- //鍒ゆ柇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涓虹┖");
- }
-
- if (!positions.contains(matList.getPosition())){
- positions.add(matList.getPosition());
- }else {
- throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBoxNo()+",鏈ㄧ浣嶇疆瀛樺湪閲嶅锛�"+matList.getPosition());
- }
-
- if (!boxNos.contains(matList.getBoxNo())){
- boxNos.add(matList.getBoxNo());
- }else {
- throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBoxNo()+",鏈ㄧ缂栫爜瀛樺湪閲嶅");
- }
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (Cools.isEmpty(wrkMast) || wrkMast.getWrkSts()!=2){
+ log.error("閫�搴撶爜鍨涘畬鎴愶紝杩斿洖鎵樼洏鐮佹湭鏌ヨ鍒板伐浣滄。妗堬紒");
+ throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode鏈煡璇㈠埌宸ヤ綔妗ｆ");
}
-
- BasDevp basDevp = basDevpService.selectById(param.getPalletizingNo2());
- if (Cools.isEmpty(basDevp)){
- throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo="+param.getPalletizingNo2()+"涓嶅瓨鍦�");
- }
- 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()+" 鎵�澶勭珯鐐逛笉鏄兘鍏ョ姸鎬�");
-// }
-
-
-
-
-// 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();
-// List<WaitPakin> waitPakins = new ArrayList<>();
-// String matnr = null;
-// for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
-// long rollUp = new Date().getTime();
-// Mat mat = matService.selectByMatnr(matList.getMatnr());
-// if (Cools.isEmpty(mat)) {
-// throw new CoolException(matList.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
-// }
-// matnr = mat.getMatnr();
-// WaitPakin waitPakin = new WaitPakin();
-// waitPakin.sync(mat);
-// waitPakin.setModel(matList.getBatch()); //鎵规
-// waitPakin.setSpecs(matList.getSpecs()); //瑙勬牸
-// waitPakin.setBatch(matList.getBoxNo()); //鏈ㄧ缂栫爜
-// waitPakin.setBrand(param.getBoxType()); //鏈ㄧ绫诲瀷
-// waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮�
-// waitPakin.setOrigin(matList.getPosition()); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
-// waitPakin.setIoStatus("Y"); // 鍏ュ嚭鐘舵��
-// waitPakin.setAnfme(matList.getAnfme().doubleValue()); // 鏈ㄧ涓摐绠旀暟閲�
-// waitPakin.setStatus("Y"); // 鐘舵��
-// waitPakin.setAppeUser(userId);
-// waitPakin.setAppeTime(now);
-// waitPakin.setModiUser(userId);
-// waitPakin.setModiTime(now);
-// waitPakin.setRollUp(rollUp);
-// if (!Cools.isEmpty(matList.getMatDetlList())){
-// for (PalletizingCompleteParam.MatDetlList matDetlList:matList.getMatDetlList()){
-// LocDetlRullUpDetail locDetlRullUpDetail = new LocDetlRullUpDetail();
-// locDetlRullUpDetail.setUuid(rollUp);
-// locDetlRullUpDetail.setRollNo(matDetlList.getBoxNoDetl());
-// locDetlRullUpDetail.setRollWeight(matDetlList.getWeightDetl().toString());
-// locDetlRullUpDetailService.insert(locDetlRullUpDetail);
-// }
-// }
-// if (!waitPakinService.insert(waitPakin)) {
-// throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
-// }
-// waitPakins.add(waitPakin);
-// }
-// LocTypeDto locTypeDto = new LocTypeDto();
-// locTypeDto.setLocType1((short)1);
-//
-// StartupDto dto = commonService.getLocNo(1, 1, param.getPalletizingNo2(), matnr,null,null, locTypeDto);
-//
-// int workNo = dto.getWorkNo();
-// // 鐢熸垚宸ヤ綔妗�
-// WrkMast wrkMast = new WrkMast();
-// wrkMast.setWrkNo(workNo);
-// wrkMast.setIoTime(new Date());
-// wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
-// wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
-// wrkMast.setIoPri(13D); // 浼樺厛绾�
-// wrkMast.setCrnNo(dto.getCrnNo());
-// wrkMast.setSourceStaNo(dto.getSourceStaNo());
-// wrkMast.setStaNo(dto.getStaNo());
-// wrkMast.setLocNo(dto.getLocNo());
-// wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
-// wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
-// wrkMast.setPicking("N"); // 鎷ｆ枡
-// wrkMast.setExitMk("N"); // 閫�鍑�
-// wrkMast.setEmptyMk("N"); // 绌烘澘
-// wrkMast.setLinkMis("Y");
-// wrkMast.setCtnType(0); // 瀹瑰櫒绫诲瀷
-// // 鎿嶄綔浜哄憳鏁版嵁
-// wrkMast.setAppeTime(now);
-// wrkMast.setModiTime(now);
-// boolean res = wrkMastService.insert(wrkMast);
-// if (!res) {
-// throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
-// }
-// // 鐢熸垚宸ヤ綔妗ｆ槑缁�
-// waitPakins.forEach(waitPakin -> {
-// WrkDetl wrkDetl = new WrkDetl();
-// wrkDetl.sync(waitPakin);
-// wrkDetl.setWrkNo(wrkMast.getWrkNo());
-// wrkDetl.setIoTime(wrkMast.getIoTime());
-// wrkDetl.setAppeTime(now);
-// wrkDetl.setModiTime(now);
-// if (!wrkDetlService.insert(wrkDetl)) {
-// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
-// }
-// });
-// // 鏇存柊鐩爣搴撲綅鐘舵��
-// LocMast locMast = locMastService.selectById(dto.getLocNo());
-// if (locMast.getLocSts().equals("O")){
-// locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
-// locMast.setModiTime(now);
-// if (!locMastService.updateById(locMast)){
-// throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
-// }
-// } else {
-// throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
-// }
+ wrkMast.setSheetNo("4");
+ wrkMastService.updateById(wrkMast);
}
@@ -996,6 +906,17 @@
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<>();
ArrayList<WrkDetlSingle> wrkDetlsOld = new ArrayList<>();
//鍒ゆ柇matLists鍙傛暟
@@ -1005,17 +926,17 @@
}else if (Cools.isEmpty(matList.getBoxNo())){
throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo涓虹┖");
}
- List<WrkDetlSingle> wrkDetlSingles = wrkDetlSingleService.selectList(new EntityWrapper<WrkDetlSingle>().eq("batch", matList.getBoxNo()));
+ WrkDetlSingle wrkDetlSingleOne = wrkDetlSingleService.selectOne(new EntityWrapper<WrkDetlSingle>().eq("batch", matList.getBoxNo()));
+ List<WrkDetlSingle> wrkDetlSingles = wrkDetlSingleService.selectList(new EntityWrapper<WrkDetlSingle>()
+ .eq("wrk_no", wrkDetlSingleOne.getWrkNo()).eq("io_time", wrkDetlSingleOne.getIoTime()));
boolean sign=true;
for (WrkDetlSingle wrkDetlSingle:wrkDetlSingles){
- if (wrkDetlSingle.getBatch().equals(matList.getBoxNo())){//鏈ㄧ缂栫爜
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(wrkDetlSingle);
- wrkDetlsNew.add(wrkDetl);
- wrkDetlsOld.add(wrkDetlSingle);
- sign=false;
- break;
- }
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(wrkDetlSingle);
+ wrkDetlsNew.add(wrkDetl);
+ wrkDetlsOld.add(wrkDetlSingle);
+ sign=false;
+ break;
}
if (sign){
throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo鏈煡璇㈠埌瀵瑰簲鐨勫伐浣滄槑缁嗭紒");
@@ -1069,69 +990,23 @@
@Override
@Transactional
public void singleMountUnstackingComplete(SingleMountUnstackingCompleteParam param) {
- Long userId = 8888L;//妗佹灦涓婁綅杞欢
+// Long userId = 8888L;//妗佹灦涓婁綅杞欢
//鍒ゆ柇param鍙傛暟
if (Cools.isEmpty(param.getBarcode())){
throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
}
-// else if (Cools.isEmpty(param.getPalletizingNo())){
-// throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
-// }
WrkMast wrkMastMatrix = wrkMastService.selectByBarcode(param.getBarcode());
if (Cools.isEmpty(wrkMastMatrix)){
throw new CoolException("鍙傛暟锛氭墭鐩樼爜鏌ヨ宸ヤ綔妗ｅけ璐ワ細"+param.getBarcode());
- }else {
-// if (wrkMastMatrix.getIoType().equals(103)){
-// List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNoUnstacking(wrkMastMatrix.getWrkNo());
-// if (Cools.isEmpty(param.getMatLists()) || param.getMatLists().size()==0 || param.getMatLists().size()!=wrkDetls.size()){
-// throw new CoolException("杩斿洖鐗╂枡鏄庣粏鏁颁负"+param.getMatLists().size()+",鎵樼洏鐮侊細"+param.getBarcode()+"搴斿墿浣欑墿鏂欐暟锛�"+wrkDetls.size());
-// }
-//
-// ArrayList<String> orgin = new ArrayList<>();
-// //鍒ゆ柇matLists鍙傛暟
-// for (SingleMountUnstackingCompleteParam.MatList matList : param.getMatLists()){
-// if (Cools.isEmpty(matList.getPosition())){
-// throw new CoolException("鍙傛暟锛氱爜鍨涗綅缃� position涓虹┖");
-// }else if (Cools.isEmpty(matList.getBoxNo())){
-// throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo涓虹┖");
-// }
-// if (!orgin.contains(matList.getPosition())){
-// orgin.add(matList.getPosition());
-// }else {
-// throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBoxNo()+",鏈ㄧ浣嶇疆瀛樺湪閲嶅");
-// }
-// boolean sign=true;
-// for (WrkDetl wrkDetl:wrkDetls){
-// if (wrkDetl.getBatch().equals(matList.getBoxNo())){//鏈ㄧ缂栫爜
-// wrkDetl.setOrigin(matList.getPosition());
-// wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("batch",wrkDetl.getBatch()));
-// sign=false;
-// break;
-// }
-// }
-// if (sign){
-// throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBoxNo()+"鏈煡璇㈠埌瀵瑰簲鐨勫伐浣滄槑缁嗭紒");
-// }
-// }
-// }
+ }
+ if (!wrkMastMatrix.getSheetNo().equals("1")){
+ throw new CoolException("鍙傛暟锛氭浠诲姟鏈笂鎶ョ姝㈠畬鎴愶細"+param.getBarcode());
}
- wrkMastMatrix.setSheetNo("2");
+ wrkMastMatrix.setSheetNo("3");
if (!wrkMastService.updateById(wrkMastMatrix)){
throw new CoolException("鏇存柊宸ヤ綔妗ｅけ璐�==銆嬫鏋朵笂浣嶈蒋浠讹細鍗曟墭鎷嗗灈瀹屾垚閫氱煡");
}
- }
-
- /*
- *
- * */
- @Override
- @Transactional
- public void cs1(String barcode) {
- BasDevp basDevp = basDevpService.selectById(216);
- basDevp.setWrkNo(9992);
- basDevp.setBarcode(barcode);
- basDevpService.updateById(basDevp);
}
/*
@@ -1212,22 +1087,48 @@
return crnStn;
}
-
- /*
- *
+ /*
+ * FQC璐ㄦ
* */
@Override
@Transactional
- public void cs3() {
- //鎷嗙洏
- WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),119);
- wrkMastSta1.setType(2);
- wrkMastSta1.setWrkType(2);
- wrkMastStaService.insert(wrkMastSta1);
- WrkMastSta wrkMastSta2 = new WrkMastSta(new Date(),121);
- wrkMastSta2.setType(2);
- wrkMastSta2.setWrkType(2);
- wrkMastStaService.insert(wrkMastSta2);
+ 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());
+ if (param.getDanger()==2){
+ String memo = Cools.isEmpty(locDetl.getMemo())? "" : locDetl.getMemo()+"锛�";
+ locDetl.setMemo(memo+"璐ㄦ缁撴灉涓嶅悎鏍硷細"+param.getMemo());//涓嶅悎鏍间細缁欏娉紝闇�瑕佹妸澶囨敞缁欏埌鍖呰鍋氬睍绀�
+ }
+ locDetlService.update(locDetl,new EntityWrapper<LocDetl>()
+ .eq("loc_no", locDetl.getLocNo())
+ .eq("batch", param.getBoxNo()));
+ }
+ }
+
}
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
--
Gitblit v1.9.1