From 0ffd698f8e3a92e0f82f16ddad90c2c86f16bfdf Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期一, 15 七月 2024 13:29:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 749 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 741 insertions(+), 8 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 bc4b8f7..181a918 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,21 +1,29 @@
package com.zy.asrs.service.impl;
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.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
+import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.MatUtils;
+import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.LocTypeDto;
+import com.zy.common.model.StartupDto;
+import com.zy.common.model.enums.WorkNoType;
+import com.zy.common.service.CommonService;
+import com.zy.common.utils.NodeUtils;
+import com.zy.common.web.WcsController;
+import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -44,6 +52,34 @@
private MatService matService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private PackService packService;
+ @Autowired
+ private TagService tagService;
+ @Autowired
+ private TagMapper tagMapper;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private LocDetlRullUpDetailService locDetlRullUpDetailService;
+ @Autowired
+ private WrkDetlSingleService wrkDetlSingleService;
+ @Autowired
+ private WrkMastStaService wrkMastStaService;
+ @Autowired
+ private WrkMastStaLogService wrkMastStaLogService;
+ @Autowired
+ private StaDescService staDescService;
+ @Autowired
+ private LocMastService locMastService;
@Override
@Transactional
@@ -177,10 +213,15 @@
}
@Override
+ @Transactional
public void pakoutOrderCreate(OpenOrderPakoutParam param) {
Order order = orderService.selectByNo(param.getOrderNo());
+ // 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
if (!Cools.isEmpty(order)) {
- throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+ if (order.getSettle() > 1L) {
+ throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+ }
+ orderService.remove(order.getId());
}
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
Date now = new Date();
@@ -311,4 +352,696 @@
return locDetlService.queryStockTotal();
}
+ @Override
+ @Transactional
+ public void packageUp(PackParam param) {
+ if (Cools.isEmpty(param.getBarcode())) {
+ throw new CoolException("barcode涓嶈兘涓虹┖");
+ }
+ Mat analyse = MatUtils.analyseMat(param.getBarcode());
+ Pack pack = packService.selectByBarcode(param.getBarcode());
+ if (null != pack) {
+ throw new CoolException(param.getBarcode() + "閲嶅鎻愪氦");
+ }
+ Date now = new Date();
+ pack = new Pack(
+ param.getBarcode(), // 鏉＄爜[闈炵┖]
+ analyse.getMatnr(), // 鍟嗗搧缂栧彿
+ analyse.getBarcode(), // 搴忓垪鐮�
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null // 澶囨敞
+ );
+ if (!packService.insert(pack)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+
+ Mat mat = matService.selectByMatnr(analyse.getMatnr());
+ if (mat == null) {
+ mat = new Mat();
+ // 鍒嗙被
+ Long tagId;
+ // 涓�绾у垎绫�
+ if (!Cools.isEmpty(param.getGroupCode()) && !Cools.isEmpty(param.getGroupName())) {
+ Tag priTag = tagService.selectByName(param.getGroupCode(), 2);
+ if (priTag == null) {
+ Tag top = tagService.getTop();
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(top.getId());
+ priTag = new Tag(
+ null, // 缂栧彿
+ param.getGroupCode(), // 鍚嶇О
+ top.getId(), // 鐖剁骇
+ top.getName(), // 鐖剁骇鍚嶇О
+ nodeUtils.path.toString(), // 鍏宠仈璺緞
+ nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+ 0, // 绫诲瀷
+ null, // 璐熻矗浜�
+ null, // 鍥剧墖
+ null, // 绠�瑕佹弿杩�
+ null, // 鏁伴噺
+ 2, // 绛夌骇
+ null, // 鎺掑簭
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null // 澶囨敞
+ );
+ if (tagMapper.insert(priTag) == 0) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ // 浜岀骇鍒嗙被
+ Tag secTag = tagService.selectByName(param.getGroupName(), 3);
+ if (secTag == null) {
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(priTag.getId());
+ secTag = new Tag(
+ null, // 缂栧彿
+ param.getGroupName(), // 鍚嶇О
+ priTag.getId(), // 鐖剁骇
+ priTag.getName(), // 鐖剁骇鍚嶇О
+ nodeUtils.path.toString(), // 鍏宠仈璺緞
+ nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+ 0, // 绫诲瀷
+ null, // 璐熻矗浜�
+ null, // 鍥剧墖
+ null, // 绠�瑕佹弿杩�
+ null, // 鏁伴噺
+ 3, // 绛夌骇
+ null, // 鎺掑簭
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null // 澶囨敞
+ );
+ if (tagMapper.insert(secTag) == 0) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ tagId = secTag.getId();
+ } else {
+ tagId = tagService.getTop().getId();
+ }
+ mat.setTagId(tagId);
+ mat.setMatnr(analyse.getMatnr());
+ mat.setMaktx(param.getMaterialName());
+ mat.setSpecs(param.getConfigureDesc());
+ mat.setModel(analyse.getModel());
+ mat.setStatus(1);
+ mat.setCreateTime(now);
+ mat.setUpdateTime(now);
+ if (!matService.insert(mat)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ } else {
+ log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
+ }
+ }
+ }
+
+ @Override
+ @Transactional
+ public void syncMat(MatSyncParam param) {
+ if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <=0 ) {
+ throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
+ }
+
+ for(MatSyncParam.MatParam matParam : param.getMatDetails()){
+ if(Cools.isEmpty(matParam.getMatnr())){
+ throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
+ }
+
+ Date now = new Date();
+ Mat mat = matService.selectByMatnr(matParam.getMatnr());
+ if (mat == null) {
+ mat = new Mat();
+ // 鍒嗙被
+ Long tagId;
+ // 涓�绾у垎绫�
+ if (!Cools.isEmpty(matParam.getGroupCode()) && !Cools.isEmpty(matParam.getGroupName())) {
+ Tag priTag = tagService.selectByName(matParam.getGroupCode(), 2);
+ if (priTag == null) {
+ Tag top = tagService.getTop();
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(top.getId());
+ priTag = new Tag(
+ null, // 缂栧彿
+ matParam.getGroupCode(), // 鍚嶇О
+ top.getId(), // 鐖剁骇
+ top.getName(), // 鐖剁骇鍚嶇О
+ nodeUtils.path.toString(), // 鍏宠仈璺緞
+ nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+ 0, // 绫诲瀷
+ null, // 璐熻矗浜�
+ null, // 鍥剧墖
+ null, // 绠�瑕佹弿杩�
+ null, // 鏁伴噺
+ 2, // 绛夌骇
+ null, // 鎺掑簭
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null // 澶囨敞
+ );
+ if (tagMapper.insert(priTag) == 0) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ // 浜岀骇鍒嗙被
+ Tag secTag = tagService.selectByName(matParam.getGroupName(), 3);
+ if (secTag == null) {
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(priTag.getId());
+ secTag = new Tag(
+ null, // 缂栧彿
+ matParam.getGroupName(), // 鍚嶇О
+ priTag.getId(), // 鐖剁骇
+ priTag.getName(), // 鐖剁骇鍚嶇О
+ nodeUtils.path.toString(), // 鍏宠仈璺緞
+ nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+ 0, // 绫诲瀷
+ null, // 璐熻矗浜�
+ null, // 鍥剧墖
+ null, // 绠�瑕佹弿杩�
+ null, // 鏁伴噺
+ 3, // 绛夌骇
+ null, // 鎺掑簭
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null // 澶囨敞
+ );
+ if (tagMapper.insert(secTag) == 0) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ tagId = secTag.getId();
+ } else {
+ tagId = tagService.getTop().getId();
+ }
+ mat.sync(param);
+// mat.setMatnr(param.getMatnr());
+// mat.setMaktx(param.getMaktx());
+// mat.setSpecs(param.getSpecs());
+// mat.setModel(param.getModel());
+
+ mat.setTagId(tagId);
+ mat.setStatus(1);
+ mat.setCreateTime(now);
+ mat.setUpdateTime(now);
+ if (!matService.insert(mat)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ } else {
+ log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
+ }
+ } else {
+ mat.sync(param);
+ if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
+ throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ }
+
+ }
+
+ /*...........................寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐...........................*/
+ /*............................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());
+ labellerMatParam.setWrkNo(basDevp.getWrkNo().toString());
+// ArrayList<LabellerMatParam.CombMat> combMats = new ArrayList<>();
+ ArrayList<LabellerMatParam.BoxNo> boxNos = new ArrayList<>();
+// String orderNo = "";
+
+ for (WrkDetl wrkDetl:wrkDetls){
+ LabellerMatParam.BoxNo boxNo = new LabellerMatParam.BoxNo();
+ boxNo.setBoxNo(wrkDetl.getBatch());
+ boxNos.add(boxNo);
+ }
+ labellerMatParam.setBoxNos(boxNos);
+// 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.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);
+ wrkMast.setStaNo(144);
+ 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 PalletizingCompleteTwoFloorParam(PalletizingCompleteTwoFloorParam 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.getBoxType())){
+ throw new CoolException("鍙傛暟锛氭湪绠辩被鍨� boxType涓虹┖");
+ }else if (Cools.isEmpty(param.getMatList()) || param.getMatList().size()==0){
+ throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
+ }
+
+ String matnrOne = "";//鏈ㄧ鐩稿悓浣嶇疆 瑙勬牸 matnr鏍￠獙 1銆佸乏
+ String matnrTwo = "";//鏈ㄧ鐩稿悓浣嶇疆 瑙勬牸 matnr鏍￠獙 2銆佸彸
+ ArrayList<String> boxNos = new ArrayList<>(); //鏈ㄧ鍞竴缂栫爜鏌ラ噸 锛坆atch锛�
+ //鍒ゆ柇matLists鍙傛暟
+ for (PalletizingCompleteTwoFloorParam.MatList matList:param.getMatList()){
+ 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.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涓虹┖");
+ }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 (!boxNos.contains(matList.getBatch())){
+ boxNos.add(matList.getBatch());
+ }else {
+ throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBatch()+",鏈ㄧ缂栫爜瀛樺湪閲嶅");
+ }
+ }
+
+// 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()+" 鎵�澶勭珯鐐逛笉鏄兘鍏ョ姸鎬�");
+// }
+
+
+ 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 (PalletizingCompleteTwoFloorParam.MatList matList:param.getMatList()){
+ Mat mat = matService.selectByMatnr(matList.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ 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.setBatch(matList.getBatch()); //鏈ㄧ缂栫爜 //鎵规 鍞竴鍊� 绠卞彿
+ waitPakin.setModel(matList.getModel()); //鍗峰彿 鍞竴鍊�
+ waitPakin.setBrand(param.getBoxType()); //鏈ㄧ绫诲瀷
+ 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.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(matList.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAppeUser(userId);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(userId);
+ waitPakin.setModiTime(now);
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ }
+
+ }
+
+ /*
+ * 鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ * */
+ @Override
+ @Transactional
+ public void palletizingCompleteS(PalletizingCompleteParam param) {
+ //鍒ゆ柇param鍙傛暟
+ if (Cools.isEmpty(param.getBarcode())){
+ throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
+ }
+
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (Cools.isEmpty(wrkMast) || wrkMast.getWrkSts()!=2){
+ log.error("閫�搴撶爜鍨涘畬鎴愶紝杩斿洖鎵樼洏鐮佹湭鏌ヨ鍒板伐浣滄。妗堬紒");
+ throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode鏈煡璇㈠埌宸ヤ綔妗ｆ");
+ }
+ wrkMast.setSheetNo("4");
+ wrkMastService.updateById(wrkMast);
+ }
+
+
+ /*
+ *涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�
+ * */
+ @Override
+ @Transactional
+ public void balconyComplete(LabellerMatParam param) {
+ if (Cools.isEmpty(param.getWrkNo())){
+ throw new CoolException("宸ヤ綔鍙蜂负绌猴紒");
+ }
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getWrkNo()));
+ if (Cools.isEmpty(wrkMast)){
+ throw new CoolException("宸ヤ綔鍙蜂负绌猴紒");
+ }
+ wrkMast.setWrkSts(57L);
+ wrkMastService.updateById(wrkMast);
+ }
+
+ /*
+ * 妗佹灦涓婁綅杞欢锛氬崟娆℃媶鍨涘畬鎴愰�氱煡
+ * */
+ @Override
+ @Transactional
+ public void singleUnstackingComplete(SingleUnstackingCompleteParam param) {
+ Long userId = 8888L;//妗佹灦涓婁綅杞欢
+ //鍒ゆ柇param鍙傛暟
+ if (Cools.isEmpty(param.getPalletizingNo())){
+ throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
+ }else if (Cools.isEmpty(param.getMatList()) || param.getMatList().size()==0){
+ throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
+ }
+
+ ArrayList<WrkDetl> wrkDetlsNew = new ArrayList<>();
+ ArrayList<WrkDetlSingle> wrkDetlsOld = new ArrayList<>();
+ //鍒ゆ柇matLists鍙傛暟
+ for (SingleUnstackingCompleteParam.MatList matList:param.getMatList()){
+ if (Cools.isEmpty(matList.getPosition())){
+ throw new CoolException("鍙傛暟锛氱爜鍨涗綅缃� position涓虹┖");
+ }else if (Cools.isEmpty(matList.getBoxNo())){
+ throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo涓虹┖");
+ }
+ 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){
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(wrkDetlSingle);
+ wrkDetlsNew.add(wrkDetl);
+ wrkDetlsOld.add(wrkDetlSingle);
+ sign=false;
+ break;
+ }
+ if (sign){
+ throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo鏈煡璇㈠埌瀵瑰簲鐨勫伐浣滄槑缁嗭紒");
+ }
+ }
+
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(202));
+ Date now = new Date();
+
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(51L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
+ wrkMast.setIoType(202); // 鍏ュ嚭搴撶姸鎬侊細202.鎷嗗灈鍚庡嚭搴�
+ wrkMast.setIoPri(99D); // 浼樺厛绾�
+ wrkMast.setSourceStaNo(param.getDevNo$());
+ wrkMast.setStaNo(144); //璐存爣绔欑偣 鐩存帴鍒板熬绔�
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeUser(userId);
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("鐢熸垚宸ヤ綔妗ｅけ璐�==銆嬫鏋朵笂浣嶈蒋浠讹細鍗曟鎷嗗灈瀹屾垚閫氱煡");
+ }
+
+ for (WrkDetl wrkDetl : wrkDetlsNew){
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setIoTime(wrkMast.getIoTime());
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiTime(now);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触==銆嬫鏋朵笂浣嶈蒋浠讹細鍗曟鎷嗗灈瀹屾垚閫氱煡");
+ }
+ }
+
+ for (WrkDetlSingle wrkDetlSingle : wrkDetlsOld) {
+ wrkDetlSingleService.delete(new EntityWrapper<WrkDetlSingle>()
+ .eq("batch",wrkDetlSingle.getBatch())
+ .eq("wrk_no",wrkDetlSingle.getWrkNo())
+ .eq("io_time",wrkDetlSingle.getIoTime()));
+ }
+
+ }
+
+ /*
+ * 妗佹灦涓婁綅杞欢锛氬崟鎵樻媶鍨涘畬鎴愰�氱煡
+ * */
+ @Override
+ @Transactional
+ public void singleMountUnstackingComplete(SingleMountUnstackingCompleteParam param) {
+// Long userId = 8888L;//妗佹灦涓婁綅杞欢
+ //鍒ゆ柇param鍙傛暟
+ if (Cools.isEmpty(param.getBarcode())){
+ throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
+ }
+ WrkMast wrkMastMatrix = wrkMastService.selectByBarcode(param.getBarcode());
+ if (Cools.isEmpty(wrkMastMatrix)){
+ throw new CoolException("鍙傛暟锛氭墭鐩樼爜鏌ヨ宸ヤ綔妗ｅけ璐ワ細"+param.getBarcode());
+ }
+
+ wrkMastMatrix.setSheetNo("2");
+ if (!wrkMastService.updateById(wrkMastMatrix)){
+ throw new CoolException("鏇存柊宸ヤ綔妗ｅけ璐�==銆嬫鏋朵笂浣嶈蒋浠讹細鍗曟墭鎷嗗灈瀹屾垚閫氱煡");
+ }
+ }
+
+ /*
+ *
+ * */
+ @Override
+ @Transactional
+ public void cs2() {
+// int[] staNos =new int[]{122};
+// for (Integer staNo:staNos){
+// int[] crnNos =new int[]{6};
+// for (Integer crnNo:crnNos){
+// descSta(staNo,crnNo);
+// }
+// }
+
+ }
+
+ private void descSta(Integer staNo,Integer crnNo){
+// int[] typeNos =new int[]{1,10,53,101,103,110};
+ int[] typeNos =new int[]{10,110};
+ for (Integer typeNo:typeNos){
+ descSta3(staNo,crnNo,typeNo);
+ }
+ }
+
+ private void descSta3(Integer staNo,Integer crnNo,Integer typeNo){
+ StaDesc staDesc = new StaDesc();
+ staDesc.setTypeNo(typeNo);
+ staDesc.setStnNo(staNo);
+ staDesc.setCrnNo(crnNo);
+ staDesc.setCrnStn(CrnNoRC(crnNo,staDesc.getTypeNo()>100));
+ descSta2(staDesc);
+ }
+
+ private void descSta2(StaDesc staDesc){
+ Date now = new Date();
+ //鍏ュ簱
+ int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>()
+ .eq("type_no", staDesc.getTypeNo())
+ .eq("stn_no", staDesc.getStnNo())
+ .eq("crn_no", staDesc.getCrnNo())
+ .eq("crn_stn", staDesc.getCrnStn()));
+ if (sameRes == 0) {
+ staDesc.setModiUser(9527L);
+ staDesc.setModiTime(now);
+ staDesc.setAppeUser(9527L);
+ staDesc.setAppeTime(now);
+ staDescService.insert(staDesc);
+ }
+ }
+
+ private Integer CrnNoRC(Integer crnNo,boolean sign){
+ Integer crnStn = 0;
+ switch (crnNo){
+ case 1:
+ crnStn = 102;
+ break;
+ case 2:
+ crnStn = 105;
+ break;
+ case 3:
+ crnStn = 108;
+ break;
+ case 4:
+ crnStn = 111;
+ break;
+ case 5:
+ crnStn = 114;
+ break;
+ case 6:
+ crnStn = 117;
+ break;
+ }
+ if (sign){
+ return crnStn-2;
+ }
+ return crnStn;
+ }
+
+ /*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
}
--
Gitblit v1.9.1