From 5e38c75bc9c609d5e41bf817756ef8ed7a0f4851 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 21 八月 2025 15:28:27 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 349 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 225 insertions(+), 124 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 7b502ba..35f4abc 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,10 +1,8 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.R;
-import com.core.common.SnowflakeIdWorker;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
@@ -12,11 +10,17 @@
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;
@@ -69,6 +73,12 @@
private WrkMastStaService wrkMastStaService;
@Autowired
private WrkMastStaLogService wrkMastStaLogService;
+ @Autowired
+ private StaDescService staDescService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private RgvOneSignService rgvOneSignService;
@Override
@Transactional
@@ -683,7 +693,7 @@
* */
@Override
@Transactional
- public void palletizingComplete(PalletizingCompleteParam param) {
+ public void PalletizingCompleteTwoFloorParam(PalletizingCompleteTwoFloorParam param) {
Long userId = 7777L;//涓帶
//鍒ゆ柇param鍙傛暟
if (Cools.isEmpty(param.getBarcode())){
@@ -692,36 +702,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()+",鏈ㄧ缂栫爜瀛樺湪閲嶅");
}
}
@@ -746,44 +780,97 @@
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);
+
}
+ }
+
+ /*
+ * 鏉剧洓(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);
}
@@ -814,30 +901,41 @@
//鍒ゆ柇param鍙傛暟
if (Cools.isEmpty(param.getPalletizingNo())){
throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
- }else if (Cools.isEmpty(param.getMatLists()) || param.getMatLists().size()==0){
+ }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<>();
ArrayList<WrkDetlSingle> wrkDetlsOld = new ArrayList<>();
//鍒ゆ柇matLists鍙傛暟
- for (SingleUnstackingCompleteParam.MatList matList:param.getMatLists()){
+ 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涓虹┖");
}
- 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鏈煡璇㈠埌瀵瑰簲鐨勫伐浣滄槑缁嗭紒");
@@ -856,7 +954,7 @@
wrkMast.setIoType(202); // 鍏ュ嚭搴撶姸鎬侊細202.鎷嗗灈鍚庡嚭搴�
wrkMast.setIoPri(99D); // 浼樺厛绾�
wrkMast.setSourceStaNo(param.getDevNo$());
- wrkMast.setStaNo(140); //璐存爣绔欑偣
+ wrkMast.setStaNo(144); //璐存爣绔欑偣 鐩存帴鍒板熬绔�
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeUser(userId);
wrkMast.setAppeTime(now);
@@ -891,54 +989,20 @@
@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("鏇存柊宸ヤ綔妗ｅけ璐�==銆嬫鏋朵笂浣嶈蒋浠讹細鍗曟墭鎷嗗灈瀹屾垚閫氱煡");
}
@@ -949,40 +1013,77 @@
* */
@Override
@Transactional
- public void cs1(String barcode) {
- BasDevp basDevp = basDevpService.selectById(216);
- basDevp.setWrkNo(9992);
- basDevp.setBarcode(barcode);
- basDevpService.updateById(basDevp);
- }
-
- /*
- *
- * */
- @Override
- @Transactional
public void cs2() {
- BasDevp basDevp = basDevpService.selectById(216);
- basDevp.setWrkNo(0);
- basDevp.setBarcode("");
- basDevpService.updateById(basDevp);
+// int[] staNos =new int[]{122};
+// for (Integer staNo:staNos){
+// int[] crnNos =new int[]{6};
+// for (Integer crnNo:crnNos){
+// descSta(staNo,crnNo);
+// }
+// }
+
}
- /*
- *
- * */
- @Override
- @Transactional
- public void cs3() {
- //鎷嗙洏
- WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),118);
- wrkMastSta1.setType(2);
- wrkMastSta1.setWrkType(2);
- wrkMastStaService.insert(wrkMastSta1);
- WrkMastSta wrkMastSta2 = new WrkMastSta(new Date(),122);
- wrkMastSta2.setType(2);
- wrkMastSta2.setWrkType(2);
- wrkMastStaService.insert(wrkMastSta2);
+ 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