From 8ce4dcbd701b40165b0dbf365f667932cf2a8916 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 06 三月 2026 08:21:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 103 +++++++++++++--------------------------------------
1 files changed, 26 insertions(+), 77 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 607bd5b..43bfd91 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -71,97 +71,46 @@
}
List<WaitPakin> waitPakins = null;
if (param.getIoType() == 1) {
- //澶勭悊鎵樼洏鐮�
- //3S19000677895,M22003772,3 ,KP, 0A2030 ,0A2030202306050023
- //3S绠辩爜鍙� ,绔瓙鐗╂枡鍙� ,鏁伴噺,鍗曚綅,渚涘簲鍟嗙紪鍙�,渚涘簲鍟嗘壒娆″彿
- //鏁伴噺鍜岄噸閲忚浆鎹㈠嚭鏉ョ殑鏄惁宸笉澶�
- //weight 涓� 43.39 鍘荤毊2.35 = 41.05
- //鎵樼洏鐮佷緥瀛� 845000820308,M11000787,1000,MT,0A1263,0A126320260120
- //鎹㈢畻闇�瑕�41.05*24.36绾︾瓑浜�1000
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
- String[] split = param.getBarcode().split(",");
- String barcode = split[0];
- String matnr = split[1];
- Double weight = Double.valueOf(split[2]);
- String unit = split[3];
- String manu = split[4];
- String batch = split[5];
- String threeCode = param.getBarcode();
- param.setBarcode(barcode);
- //瀹為檯绉伴噸鏁伴噺
- Double m = param.getWeight() -2.35;
-
- Mat mat = matService.selectByMatnr(matnr);
- if(mat==null){
- log.info("娌℃湁鎵惧埌璇ョ墿鏂欐。妗�--"+matnr+"缁勬墭鏃惰嚜鍔ㄦ柊澧炵墿鏂欙紝榛樿24.36KG/M");
- mat = new Mat();
- mat.setTagId(1L);
- mat.setLocType(1L);
- mat.setMatnr(matnr);
- mat.setUnit(unit);
- mat.setManu(manu);
- mat.setMaktx(matnr);
- mat.setVolume(24.36);
- matService.insert(mat);
- }else {
- //鏆傚畾
-
- }
- m=m*mat.getVolume();
- //Double val = Math.round((m - matnr.getSafeQty()) * 10000) / 10000.0;
- Config config = configService.selectConfigByCode("SimulationInbound");
- if (config != null && config.getValue().equals("Y")) {
- WaitPakin waitPakin1 = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
- if (Cools.isEmpty(waitPakin1)) {
- WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("io_status", "N"));
- if (waitPakin != null) {
- waitPakinService.updateForSet("zpallet = '" + param.getBarcode() + "'", new EntityWrapper<WaitPakin>().eq("zpallet", waitPakin.getZpallet()));
- }
- }
- }
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
- if (Cools.isEmpty(waitPakins)) {
- WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
- if (wrkMast != null && wrkMast.getIoType() == 103) {
- return R.parse(CodeRes.PICK_600);
- }
- WaitPakin waitPakin = new WaitPakin();
- waitPakin.sync(mat);
- waitPakin.setZpallet(param.getBarcode());
- waitPakin.setAnfme(m);
- waitPakin.setThreeCode(threeCode);
- waitPakinService.insert(waitPakin);
- }else {
- for(WaitPakin waitPakin : waitPakins){
- waitPakin.setAnfme(m);
- waitPakinService.update(waitPakin,new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
- }
- }
- //瀹為檯闀垮害
- WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
- if (Cools.isEmpty(waitPakin)) {
- return R.error(CodeRes.NO_COMB_700);
- }
- boolean flag = false;
- if(Cools.isEmpty(waitPakin.getBeBatch())||waitPakin.getBeBatch()!=1){
- flag = true;
- }
- if (flag && (weight - m < -2.0 || weight - m > 2.0)) {
- return R.error("浜岀淮鐮�="+threeCode+"鐨勭墿鏂欏疄闄呯О閲嶈浆鎹㈡垚鐨勭背鏁板拰鐗╂枡鏍囩鎻愪緵鐨勭背鏁扮浉宸緝澶ч渶瑕侀��鍥炴垨鑰呮爣璁板悗鎵嶈兘鍏ュ簱锛�");
- }
-
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
if (countLoc > 0 || countWrk > 0) {
return R.error(CodeRes.EXIST_500);
}
+ if (Cools.isEmpty(waitPakins)) {
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (wrkMast != null && wrkMast.getIoType() == 103) {
+ return R.parse(CodeRes.PICK_600);
+ }
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "SimulationWarehousing").eq("value", "Y"));
+ if (!Cools.isEmpty(config)) {
+ waitPakins = waitPakinService.selectList(
+ new EntityWrapper<WaitPakin>()
+ .eq("io_status", "N"));
+ if (Cools.isEmpty(waitPakins)) {
+ return R.parse(CodeRes.NO_COMB_700);
+ }
+ String barcode = "";
+ for (WaitPakin waitPakin : waitPakins) {
+ barcode = waitPakin.getZpallet();
+ break;
+ }
+ if (!Cools.isEmpty(barcode)){
+ waitPakinService.updateForSet("zpallet='"+param.getBarcode()+"'",new EntityWrapper<WaitPakin>().eq("zpallet",barcode));
+ }
+ }else{
+ return R.parse(CodeRes.NO_COMB_700);
+ }
+ }
}
if (Cools.isEmpty(param.getLocType1())){
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
+
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
sourceStaNo.setLocType1(param.getLocType1());
--
Gitblit v1.9.1