igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1104.java
@@ -1,5 +1,6 @@ package com.ld.igds.sh.service; import com.ld.igds.constant.DepotStatus; import com.ld.igds.log.service.InteStatusLogService; import com.ld.igds.models.Depot; import com.ld.igds.models.InteStatusLog; @@ -71,7 +72,7 @@ dto.setHwqyrq(DateFormatUtils.format((depot.getStoreDate()==null?new Date():depot.getStoreDate()),"yyyy-MM-dd")); dto.setHwrl(depot.getStorageReal()==null?"0.0":depot.getStorageReal() + ""); dto.setCfbh(depot.getId().substring(0,25)); dto.setHwzt(apiShUtil.getDepotStatus(depot.getDepotStatus())); dto.setHwzt(DepotStatus.getGBCode(depot.getDepotStatus())); dto.setClfs(depot.getStoreType()); dto.setBgy(depot.getStoreKeeper()); dto.setBgyxm(depot.getStoreKeeperName()); igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1106.java
@@ -84,11 +84,7 @@ dto.setSjcr(depot.getStorageMax() == null ? "0.0" : depot.getStorageMax() + ""); dto.setQyrq(DateFormatUtils.format((depot.getStoreDate() == null ? new Date() : depot.getStoreDate()), "yyyy-MM-dd")); if(DepotStatus.STATUS_08.getCode().equals(depot.getDepotStatus())){ dto.setAjzt("3"); //需大修 }else { dto.setAjzt("1"); //玩好 } dto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")); //查询日志状态表，设置操作标志 igds-api-inte/src/main/java/com/ld/igds/sh/util/ApiShUtil.java
@@ -2,6 +2,7 @@ import com.ld.igds.constant.DepotStatus; import org.springframework.stereotype.Component; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -14,29 +15,10 @@ @Component public class ApiShUtil { /** * 仓库状态转为货位状态 * @param depotStatus * @return */ public String getDepotStatus(String depotStatus){ if(DepotStatus.STATUS_01.getCode().equals(depotStatus)){ return "1"; } if(DepotStatus.STATUS_03.getCode().equals(depotStatus)){ return "2"; } if(DepotStatus.STATUS_02.getCode().equals(depotStatus)){ return "3"; } if(DepotStatus.STATUS_04.getCode().equals(depotStatus)){ return "4"; } return "9"; } /** * 获取图片的二进制流 * * @param imgPath * @return */ igds-core/src/main/java/com/ld/igds/common/DepotStatusService.java
@@ -43,7 +43,7 @@ //气调状态，不能操作窗户、空调、通风口、混流风机、轴流风机 String msg = "当前仓库状态为：气调中，禁止执行通风等操作，请联系管理员。"; if (DepotStatus.STATUS_05.getCode().equals(depot.getDepotStatus())) { if (DepotStatus.STATUS_31.getCode().equals(depot.getDepotStatus())) { for (ExeDevice device : deviceList) { if (DeviceType.TYPE_01.getCode().equals(device.getType())) return msg; @@ -63,7 +63,7 @@ //温控状态，不能操作窗户、通风口、混流风机、轴流风机 msg = "当前仓库状态为：温控中，禁止执行通风等操作，请联系管理员。"; if (DepotStatus.STATUS_09.getCode().equals(depot.getDepotStatus())) { if (DepotStatus.STATUS_34.getCode().equals(depot.getDepotStatus())) { for (ExeDevice device : deviceList) { if (DeviceType.TYPE_01.getCode().equals(device.getType())) return msg; @@ -82,7 +82,7 @@ //熏蒸状态，所有设备均不支持操作 msg = "当前仓库状态为：熏蒸中，禁止所有远程操作，请联系管理员。"; if (DepotStatus.STATUS_06.getCode().equals(depot.getDepotStatus())) { if (DepotStatus.STATUS_32.getCode().equals(depot.getDepotStatus())) { return msg; }
@@ -318,39 +318,34 @@ @Override public void initInoutDepotStore(InoutData data) { String depotStatus = DepotStatus.STATUS_03.getCode(); if (InoutConstant.TYPE_OUT.equals(data.getType())) { depotStatus = DepotStatus.STATUS_04.getCode(); } //先从缓存中获取下信息，查看是否已经初始化过数据，如果有则直接跳过，如果没有则重新验证 String key = RedisConst.buildKey(data.getDepotId(), "DEPOT_STORE", depotStatus); String tag = (String) redisUtil.get(key); if (null != tag) return; // String key = RedisConst.buildKey(data.getDepotId(), "DEPOT_STORE", depotStatus); // String tag = (String) redisUtil.get(key); // if (null != tag) return; //获取当前仓库最后一个库存记录 DepotStore depotStore = getLastDepotStore(data.getDepotId()); //如果有数据，并且状态类一致，表示缓存没有了，但是已经做过初始化 if (null != depotStore && depotStatus.equals(depotStore.getDepotStatus())) { redisUtil.set(key, depotStatus, 5 * 24 * 60 * 60); return; } // if (null != depotStore && depotStatus.equals(depotStore.getDepotStatus())) { // redisUtil.set(key, depotStatus, 5 * 24 * 60 * 60); // return; // } //从来没有做个库存管理调整 if (null == depotStore) { Depot depot = this.getCacheDepot(data.getCompanyId(), data.getDepotId()); depotStore = new DepotStore(depot, depotStatus); if (null != data.getFoodYear()) { depotStore.setFoodYear(data.getFoodYear()); } } else { //有记录，但是状态与当前作业不一致，也需要初始化 depotStore.setDepotStatus(depotStatus); depotStore.setUpdateDate(new Date()); depotStore.setUpdateUser(null); } // if (null == depotStore) { // Depot depot = this.getCacheDepot(data.getCompanyId(), data.getDepotId()); // depotStore = new DepotStore(depot, depotStatus); // if (null != data.getFoodYear()) { // depotStore.setFoodYear(data.getFoodYear()); // } // // } else { //有记录，但是状态与当前作业不一致，也需要初始化 // depotStore.setDepotStatus(depotStatus); // depotStore.setUpdateDate(new Date()); // depotStore.setUpdateUser(null); // } depotStore.setId(null); if (InoutConstant.TYPE_OUT.equals(data.getType())) { @@ -367,7 +362,7 @@ addDepotStore(depotStore, false); commonMapper.updateDepotStatus(depotStore.getCompanyId(), depotStore.getDepotId(), depotStore.getDepotStatus()); redisUtil.set(key, depotStatus, 5 * 24 * 60 * 60); // redisUtil.set(key, depotStatus, 5 * 24 * 60 * 60); } @Override igds-core/src/main/java/com/ld/igds/constant/DepotStatus.java
@@ -5,15 +5,15 @@ */ public enum DepotStatus { STATUS_01("01", "空仓"), STATUS_02("02", "满仓"), STATUS_03("03", "入库中"), STATUS_04("04", "出库中"), STATUS_05("05", "气调中"), STATUS_06("06", "熏蒸中"), STATUS_07("07", "通风中"), STATUS_09("09", "温控中"), STATUS_08("08", "维修中"); STATUS_1("1", "空仓"), STATUS_2("2", "入库中"), STATUS_3("3", "满仓"), STATUS_4("4", "出库中"), STATUS_31("31", "满仓-气调中"), STATUS_32("32", "满仓-熏蒸中"), STATUS_33("33", "满仓-通风中"), STATUS_34("34", "满仓-温控中"), STATUS_9("9", "其他"); private String code; private String msg; @@ -34,15 +34,29 @@ public static String getMsg(String code) { if(null == code) return null; if(DepotStatus.STATUS_01.getCode().equals(code)) return DepotStatus.STATUS_01.getMsg(); if(DepotStatus.STATUS_02.getCode().equals(code)) return DepotStatus.STATUS_02.getMsg(); if(DepotStatus.STATUS_03.getCode().equals(code)) return DepotStatus.STATUS_03.getMsg(); if(DepotStatus.STATUS_04.getCode().equals(code)) return DepotStatus.STATUS_04.getMsg(); if(DepotStatus.STATUS_05.getCode().equals(code)) return DepotStatus.STATUS_05.getMsg(); if(DepotStatus.STATUS_06.getCode().equals(code)) return DepotStatus.STATUS_06.getMsg(); if(DepotStatus.STATUS_07.getCode().equals(code)) return DepotStatus.STATUS_07.getMsg(); if(DepotStatus.STATUS_08.getCode().equals(code)) return DepotStatus.STATUS_08.getMsg(); if (DepotStatus.STATUS_1.getCode().equals(code)) return DepotStatus.STATUS_1.getMsg(); if (DepotStatus.STATUS_2.getCode().equals(code)) return DepotStatus.STATUS_2.getMsg(); if (DepotStatus.STATUS_3.getCode().equals(code)) return DepotStatus.STATUS_3.getMsg(); if (DepotStatus.STATUS_4.getCode().equals(code)) return DepotStatus.STATUS_4.getMsg(); if (DepotStatus.STATUS_31.getCode().equals(code)) return DepotStatus.STATUS_31.getMsg(); if (DepotStatus.STATUS_32.getCode().equals(code)) return DepotStatus.STATUS_32.getMsg(); if (DepotStatus.STATUS_33.getCode().equals(code)) return DepotStatus.STATUS_33.getMsg(); if (DepotStatus.STATUS_34.getCode().equals(code)) return DepotStatus.STATUS_34.getMsg(); return DepotStatus.STATUS_9.getMsg(); } public static String getGBCode(String code) { if (null == code) DepotStatus.STATUS_9.getCode(); if (DepotStatus.STATUS_31.equals(code)) return DepotStatus.STATUS_3.getCode(); if (DepotStatus.STATUS_32.equals(code)) return DepotStatus.STATUS_3.getCode(); if (DepotStatus.STATUS_33.equals(code)) return DepotStatus.STATUS_3.getCode(); if (DepotStatus.STATUS_34.equals(code)) return DepotStatus.STATUS_3.getCode(); return code; } } igds-core/src/main/java/com/ld/igds/constant/DepotType.java
@@ -1,12 +1,13 @@ package com.ld.igds.constant; /** * 仓库类型 * 仓库类型，针对当前系统所支持的仓房类型，非国标类型 * @author jiazx * */ public enum DepotType { TYPE_01("01", "高大平房仓"), TYPE_01("01", "平房仓"), TYPE_02("02", "浅圆仓"), TYPE_03("03", "储油罐"), TYPE_04("04", "立筒仓"), @@ -39,7 +40,7 @@ if(DepotType.TYPE_04.getCode().equals(code)) return DepotType.TYPE_04.getMsg(); return code; return TYPE_99.getMsg(); } } igds-core/src/main/java/com/ld/igds/constant/FoodLevel.java
@@ -7,12 +7,13 @@ * 1，删除特等，从1等开始 */ public enum FoodLevel { LEVEL_01("01", "一等"), LEVEL_02("02", "二等"), LEVEL_03("03", "三等"), LEVEL_04("04", "四等"), LEVEL_05("05", "五等"), LEVEL_99("99", "等外"); LEVEL_06("06", "等外"); private String code; private String msg; @@ -37,7 +38,6 @@ if(FoodLevel.LEVEL_03.getCode().equals(code)) return FoodLevel.LEVEL_03.getMsg(); if(FoodLevel.LEVEL_04.getCode().equals(code)) return FoodLevel.LEVEL_04.getMsg(); if(FoodLevel.LEVEL_05.getCode().equals(code)) return FoodLevel.LEVEL_05.getMsg(); if(FoodLevel.LEVEL_99.getCode().equals(code)) return FoodLevel.LEVEL_99.getMsg(); return code; return FoodLevel.LEVEL_06.getMsg(); } } igds-core/src/main/java/com/ld/igds/constant/FoodType.java
@@ -10,7 +10,6 @@ public static String getMsg(String code) { if (null == code) return ""; return DicTrigger.mapFoodType.get(code); } } igds-core/src/main/java/com/ld/igds/models/DepotStore.java
@@ -119,10 +119,14 @@ @PropertyDef(label = "修改人") private String updateUser; @Column(name = "UPDATE_DATE_") @PropertyDef(label = "修改时间") private Date updateDate; @Column(name = "CREATE_DATE_") private Date createDate; public DepotStore() { }
@@ -4,14 +4,12 @@ import com.ld.igds.constant.Constant; import com.ld.igds.constant.NoticeType; import lombok.Data; import org.h2.api.DatabaseEventListener; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; import java.io.Serializable; import java.util.Date; /** * 警告配置 igds-core/src/main/java/com/ld/igds/view/Depot.view.xml
@@ -129,30 +129,7 @@ <Property name="dataType">String</Property> </PropertyDef> </DataType> <DataType name="dtDepot" parent="global:dtDepot"> <ClientEvent name="onDataChange">var prop = arg.property;
 var entity = arg.entity;
 
 /**
 * "01", //空仓
 "02",//满仓
 "03",//入库
 "04",//出库
 */
 if("depotStatus" == prop){//表示状态修改
 entity.set("editTag",entity.get("editTag")+"-depotStatus");
 
 if(arg.newValue == "01" || arg.newValue == "02" || arg.newValue == "03" || arg.newValue == "04"){
 $alert("仓库状态=满仓、空仓、出库中、入库中时需要通过 库存管理 功能进行修改！！");
 view.get("#btnOK").set("disabled",true);
 }else{
 view.get("#btnOK").set("disabled",false);
 }
 }</ClientEvent> <PropertyDef name="editTag"> <Property name="label">修改标记</Property> </PropertyDef> </DataType> <DataType name="dtDepot" parent="global:dtDepot"/> </Model> <View layout="padding:5;regionPadding:5"> <ClientEvent name="onReady">var deptId = window.parent.DEPT_ID;//页面选择的分库编码
 @@ -269,17 +246,13 @@ <Property name="property">foodYear</Property> <Property name="align">center</Property> </DataColumn> <DataColumn name="foodLocation"> <Property name="property">foodLocation</Property> <Property name="align">center</Property> </DataColumn> <DataColumn name="depotType"> <Property name="property">depotType</Property> <Property name="align">center</Property> </DataColumn> </DataGrid> <Dialog id="depotdialog"> <Property name="caption">仓库基本信息</Property> <Property name="caption">货位信息</Property> <Property name="width">1200</Property> <Property name="closeable">false</Property> <Buttons> @@ -308,7 +281,7 @@ </Buttons> <Children> <FieldSet layout="padding:15"> <Property name="caption">仓库基本信息</Property> <Property name="caption">基本信息</Property> <Buttons/> <Children> <AutoForm> @@ -343,9 +316,8 @@ <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">storageReal</Property> <Property name="property">storageReal</Property> <Property name="readOnly">true</Property> <Property name="name">storeType</Property> <Property name="property">storeType</Property> <Editor/> </AutoFormElement> <AutoFormElement> @@ -359,14 +331,14 @@ <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">depotStatus</Property> <Property name="property">depotStatus</Property> <Property name="trigger">autoMappingDropDown2</Property> <Property name="name">granaryId</Property> <Property name="property">granaryId</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">storeType</Property> <Property name="property">storeType</Property> <Property name="name">depotStatus</Property> <Property name="property">depotStatus</Property> <Property name="trigger">autoMappingDropDown2</Property> <Editor/> </AutoFormElement> <Label layoutConstraint="colSpan:3"> @@ -383,7 +355,7 @@ <Property name="height">10</Property> </Control> <FieldSet layout="padding:15"> <Property name="caption">粮油基本信息</Property> <Property name="caption">储粮信息</Property> <Buttons/> <Children> <AutoForm> @@ -393,6 +365,12 @@ <Property name="labelAlign">right</Property> <Property name="cols">*,*,*</Property> <Property name="labelWidth">110</Property> <AutoFormElement> <Property name="name">storageReal</Property> <Property name="property">storageReal</Property> <Property name="readOnly">true</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">foodType</Property> <Property name="property">foodType</Property> @@ -453,17 +431,18 @@ <Property name="trigger">ddFoodOrigin</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">orientation</Property> <Property name="property">orientation</Property> <Property name="trigger">listOri</Property> <Editor/> </AutoFormElement> <AutoFormElement layoutConstraint="colSpan:3"> <Property name="name">remark</Property> <Property name="property">remark</Property> <Editor/> </AutoFormElement> <Label layoutConstraint="colSpan:3"> <Property name="text">说明：储备粮质检信息会根据质量管理 自动同步更新</Property> <Property name="style"> <Property name="color">blue</Property> <Property name="padding-left">50px</Property> </Property> </Label> </AutoForm> </Children> </FieldSet> igds-core/src/main/java/com/ld/igds/view/DepotPR.java
@@ -10,11 +10,13 @@ import com.ld.igds.io.request.DepotStatusRequest; import com.ld.igds.io.response.BaseResponse; import com.ld.igds.models.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import com.bstek.bdf2.core.business.IUser; import com.bstek.dorado.annotation.DataProvider; import com.bstek.dorado.annotation.DataResolver; @@ -23,6 +25,9 @@ import com.ld.igds.common.CoreSerService; import com.ld.igds.constant.BizType; import com.ld.igds.constant.Constant; import com.ld.igds.constant.DepotStatus; import com.ld.igds.constant.DepotType; import com.ld.igds.constant.FoodLevel; import com.ld.igds.order.ExeOrderService; import com.ld.igds.order.data.ExeRequest; import com.ld.igds.util.ContextUtil; @@ -46,6 +51,63 @@ @Autowired private ExeOrderService exeOrderService; /** * 仓房类型-非国标定义 * ${dorado.getDataProvider("depotPR#triggerDepotType").getResult()} * * @return */ @DataProvider public List<DicTrigger> triggerDepotType() { List<DicTrigger> list = new ArrayList<DicTrigger>(); list.add(new DicTrigger(DepotType.TYPE_01.getCode(), DepotType.TYPE_01.getMsg())); list.add(new DicTrigger(DepotType.TYPE_02.getCode(), DepotType.TYPE_02.getMsg())); list.add(new DicTrigger(DepotType.TYPE_03.getCode(), DepotType.TYPE_03.getMsg())); list.add(new DicTrigger(DepotType.TYPE_04.getCode(), DepotType.TYPE_04.getMsg())); list.add(new DicTrigger(DepotType.TYPE_99.getCode(), DepotType.TYPE_99.getMsg())); return list; } /** * 仓房状态 * ${dorado.getDataProvider("depotPR#triggerDepotStatus").getResult()} * * @return */ @DataProvider public List<DicTrigger> triggerDepotStatus() { List<DicTrigger> list = new ArrayList<DicTrigger>(); list.add(new DicTrigger(DepotStatus.STATUS_1.getCode(), DepotStatus.STATUS_1.getMsg())); list.add(new DicTrigger(DepotStatus.STATUS_2.getCode(), DepotStatus.STATUS_2.getMsg())); list.add(new DicTrigger(DepotStatus.STATUS_3.getCode(), DepotStatus.STATUS_3.getMsg())); list.add(new DicTrigger(DepotStatus.STATUS_4.getCode(), DepotStatus.STATUS_4.getMsg())); list.add(new DicTrigger(DepotStatus.STATUS_31.getCode(), DepotStatus.STATUS_31.getMsg())); list.add(new DicTrigger(DepotStatus.STATUS_32.getCode(), DepotStatus.STATUS_32.getMsg())); list.add(new DicTrigger(DepotStatus.STATUS_33.getCode(), DepotStatus.STATUS_33.getMsg())); list.add(new DicTrigger(DepotStatus.STATUS_34.getCode(), DepotStatus.STATUS_34.getMsg())); list.add(new DicTrigger(DepotStatus.STATUS_9.getCode(), DepotStatus.STATUS_9.getMsg())); return list; } /** * 粮食等级 * ${dorado.getDataProvider("depotPR#triggerFoodLevel").getResult()} * * @return */ @DataProvider public List<DicTrigger> triggerFoodLevel() { List<DicTrigger> list = new ArrayList<DicTrigger>(); list.add(new DicTrigger(FoodLevel.LEVEL_01.getCode(), FoodLevel.LEVEL_01.getMsg())); list.add(new DicTrigger(FoodLevel.LEVEL_02.getCode(), FoodLevel.LEVEL_02.getMsg())); list.add(new DicTrigger(FoodLevel.LEVEL_03.getCode(), FoodLevel.LEVEL_03.getMsg())); list.add(new DicTrigger(FoodLevel.LEVEL_04.getCode(), FoodLevel.LEVEL_04.getMsg())); list.add(new DicTrigger(FoodLevel.LEVEL_05.getCode(), FoodLevel.LEVEL_05.getMsg())); list.add(new DicTrigger(FoodLevel.LEVEL_06.getCode(), FoodLevel.LEVEL_06.getMsg())); return list; } /** * 储粮方式 * ${dorado.getDataProvider("depotPR#triggerStoreType").getResult()} @@ -57,12 +119,28 @@ List<DicTrigger> list = new ArrayList<DicTrigger>(); list.add(new DicTrigger("1", "散装储粮")); list.add(new DicTrigger("2", "包装储粮")); list.add(new DicTrigger("3", "围包散存")); list.add(new DicTrigger("3", "围包存")); list.add(new DicTrigger("9", "其他")); return list; } /** * 管理方式 * ${dorado.getDataProvider("depotPR#triggerManagerType").getResult()} * * @return */ @DataProvider public List<DicTrigger> triggerManagerType() { List<DicTrigger> list = new ArrayList<DicTrigger>(); list.add(new DicTrigger("01", "直储")); list.add(new DicTrigger("02", "代储")); list.add(new DicTrigger("03", "租仓")); list.add(new DicTrigger("04", "委托")); return list; } /** * 电缆起始方位 * ${dorado.getDataProvider("depotPR#triggerStartOrientation").getResult()} * igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
@@ -13,12 +13,8 @@ <DataSet id="dsMain"> <Property name="pageSize">20</Property> <Property name="dataType">[dtMain]</Property> <Property name="dataProvider">depotStorePR#pageListDepotStore</Property> <Property name="dataProvider">depotStorePR#pageList</Property> <Property name="loadMode">lazy</Property> </DataSet> <DataSet id="dsDepot"> <Property name="dataType">[dtDepot]</Property> <Property name="dataProvider">depotPR#getAllCache</Property> </DataSet> <Container layout="regionPadding:10" layoutConstraint="top"> <Property name="exClassName">bg-color</Property> @@ -78,11 +74,6 @@ <Property name="align">center</Property> <Property name="name">depotId</Property> </DataColumn> <DataColumn> <Property name="property">storeType</Property> <Property name="align">center</Property> <Property name="name">storeType</Property> </DataColumn> <DataColumn name="depotStatus"> <Property name="property">depotStatus</Property> <Property name="align">center</Property> @@ -107,26 +98,25 @@ <Property name="property">foodYear</Property> <Property name="align">center</Property> </DataColumn> <DataColumn name="storeDate"> <Property name="property">storeDate</Property> <Property name="align">center</Property> </DataColumn> <DataColumn name="storageReal"> <Property name="property">storageReal</Property> <Property name="align">center</Property> </DataColumn> <DataColumn name="storageSettle"> <Property name="property">storageSettle</Property> </DataColumn> <DataColumn name="updateDate"> <Property name="property">updateDate</Property> <Property name="align">center</Property> </DataColumn> </DataGrid> </Container> <Container layoutConstraint="bottom"> <Property name="exClassName">bg-color</Property> <ToolBar layoutConstraint="bottom"> <Fill/> <DataPilot layoutConstraint="right"> <Property name="itemCodes">pageSize,pages</Property> <Property name="dataSet">dsMain</Property> </DataPilot> </ToolBar> </Container> <Dialog id="dialogMain"> <Property name="caption">库存信息</Property> @@ -165,7 +155,7 @@ <AutoFormElement> <Property name="name">depotId</Property> <Property name="property">depotId</Property> <Property name="trigger">dsddDepot</Property> <Property name="trigger">autoMappingDropDown1</Property> <Editor/> </AutoFormElement> <AutoFormElement> @@ -177,6 +167,7 @@ <AutoFormElement> <Property name="name">storeType</Property> <Property name="property">storeType</Property> <Property name="trigger">autoMappingDropDown1</Property> <Editor/> </AutoFormElement> <AutoFormElement> @@ -192,27 +183,74 @@ <AutoFormElement> <Property name="name">foodLevel</Property> <Property name="property">foodLevel</Property> <Property name="trigger">autoMappingDropDown1</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">foodLocation</Property> <Property name="property">foodLocation</Property> <Property name="trigger">ddFoodOrigin</Property> <Property name="name">manageType</Property> <Property name="property">manageType</Property> <Editor/> </AutoFormElement> <Label> <Property name="style"> <Property name="color">red</Property> <Property name="font-size">12px</Property> </Property> </Label> <AutoFormElement> <Property name="name">foodYear</Property> <Property name="property">foodYear</Property> <Property name="trigger">yearDropDown1</Property> <Editor/> </AutoFormElement> <Label> <Property name="text">货位状态=空仓/入库中/出库中，必填</Property> <Property name="style"> <Property name="color">red</Property> <Property name="font-size">12px</Property> </Property> </Label> <AutoFormElement> <Property name="name">country</Property> <Property name="property">country</Property> <Editor/> </AutoFormElement> <Label> <Property name="text">货位状态=空仓/入库中/出库中，必填</Property> <Property name="style"> <Property name="color">blue</Property> </Property> </Label> <AutoFormElement> <Property name="name">foodLocation</Property> <Property name="property">foodLocation</Property> <Property name="trigger">ddFoodOrigin</Property> <Editor/> </AutoFormElement> <Label> <Property name="text">货位状态=空仓/入库中/出库中，必填</Property> <Property name="style"> <Property name="color">blue</Property> </Property> </Label> <AutoFormElement> <Property name="name">storageReal</Property> <Property name="property">storageReal</Property> <Editor/> </AutoFormElement> <Label> <Property name="text">说明：仓库状态=满仓，空仓 切记录入库存记录</Property> <Property name="text">必填，空仓=0，入库/出库数量之和</Property> <Property name="style"> <Property name="color">blue</Property> </Property> </Label> <AutoFormElement> <Property name="name">storageSettle</Property> <Property name="property">storageSettle</Property> <Editor/> </AutoFormElement> <Label> <Property name="text">必填，空仓=0，入库/出库结算数量之和</Property> <Property name="style"> <Property name="color">blue</Property> </Property> @@ -223,7 +261,7 @@ <Editor/> </AutoFormElement> <Label> <Property name="text">说明：仓库状态=满仓，必填</Property> <Property name="text">货位状态=空仓/出库中，必填</Property> <Property name="style"> <Property name="color">blue</Property> </Property> @@ -234,7 +272,7 @@ <Editor/> </AutoFormElement> <Label> <Property name="text">说明：第一车入库时间，仓库状态=入库中，必填</Property> <Property name="text">货位状态=空仓/入库中/出库中，必填。第一车入仓时间</Property> <Property name="style"> <Property name="color">blue</Property> </Property> @@ -245,7 +283,7 @@ <Editor/> </AutoFormElement> <Label> <Property name="text">说明：第一车出库时间，仓库状态=出库中，必填</Property> <Property name="text">货位状态=空仓，必填。最后一车粮食出仓时间</Property> <Property name="style"> <Property name="color">blue</Property> </Property> @@ -255,11 +293,23 @@ <Property name="property">grainHeight</Property> <Editor/> </AutoFormElement> <Label> <Property name="text">货位状态=满仓，可填</Property> <Property name="style"> <Property name="color">blue</Property> </Property> </Label> <AutoFormElement> <Property name="name">grainVolume</Property> <Property name="property">grainVolume</Property> <Editor/> </AutoFormElement> <Label> <Property name="text">货位状态=满仓，可填</Property> <Property name="style"> <Property name="color">blue</Property> </Property> </Label> <AutoFormElement layoutConstraint="colSpan:2"> <Property name="name">remark</Property> <Property name="property">remark</Property> @@ -285,7 +335,7 @@ <YearDropDown id="yearDropDown1"/> <CustomDropDown id="ddFoodOrigin"> <Property name="minHeight">500</Property> <Property name="assignmentMap">foodLocation=name</Property> <Property name="assignmentMap">foodLocation=name,foodLocationId=code</Property> <Property name="minWidth">500</Property> <Container layout="regionPadding:5"> <DataSet id="dsFoodOrigin"> @@ -355,10 +405,5 @@ <Property name="titleName">{"unit":"KG","title":"仓库信息列表","timeDesc":"now()"}</Property> <Property name="showTitle">true</Property> </Export2ReportAction> <DataSetDropDown id="dsddDepot"> <Property name="dataSet">dsDepot</Property> <Property name="assignmentMap">depotId=id,depotStatus=depotStatus,storeType=storeType,foodType=foodType,foodVariety=foodVariety,foodLevel=foodLevel,foodLocation=foodLocation,depotStatus=depotStatus,foodYear=foodYear,storeDate=storeDate</Property> <Property name="property">name</Property> </DataSetDropDown> </View> </ViewConfig> igds-core/src/main/java/com/ld/igds/view/DepotStorePR.java
@@ -5,7 +5,6 @@ import com.bstek.dorado.annotation.Expose; import com.bstek.dorado.data.provider.Page; import com.ld.igds.models.DepotStore; import com.ld.igds.view.service.HDepotService; import com.ld.igds.view.service.HDepotStoreService; import org.springframework.stereotype.Component; @@ -30,19 +29,17 @@ /** * depotStorePR#pageListDepotStore * depotStorePR#pageList * * @Desc: 分页查询库存信息 * @author: Andy * @update-time: 2022/11/17 */ @DataProvider public void pageListDepotStore(Page<DepotStore> page, Map<String, Object> param) throws Exception { public void pageList(Page<DepotStore> page, Map<String, Object> param) throws Exception { if (null == param) { param = new HashMap<>(); } depotStoreService.listDepotStore(page, param); } @@ -54,9 +51,11 @@ @DataResolver public void saveDepotStore(DepotStore data) { //TODO 根据页面说明增加保存前验证 2023年5月27日 18:53:56 depotStoreService.saveDepotStore(data); //更新库存和状态 //根据库存信息更新到仓库信息，仓库储粮信息以当前为准 depotPR.updateByStore(data); //远程同步状态 igds-core/src/main/java/com/ld/igds/view/service/HDepotStoreService.java
@@ -45,7 +45,8 @@ } String countHql = " select count(*) " + hql; hql += " order by createDate desc"; hql += " order by updateDate desc"; this.pagingQuery(page, hql, countHql, args); } igds-core/src/main/java/models/igds.model.xml
@@ -188,18 +188,24 @@ </PropertyDef> <PropertyDef name="buildingId"> <Property></Property> <Property name="label">所属建筑</Property> <Property name="label">所属仓房</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("buildingPR#getCacheBuilding").getResult()}</Property> <Property name="keyProperty">id</Property> <Property name="valueProperty">name</Property> </Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="granaryId"> <Property></Property> <Property name="label">所属廒间</Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="depotType"> <Property></Property> <Property name="label">仓库类型</Property> <Property name="label">仓房类型</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("DEPOT_TYPE")}</Property> <Property name="mapValues">${dorado.getDataProvider("depotPR#triggerDepotType").getResult()}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> @@ -209,20 +215,23 @@ <Property></Property> <Property name="label">仓库状态</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("DEPOT_STATUS")}</Property> <Property name="mapValues">${dorado.getDataProvider("depotPR#triggerDepotStatus").getResult()}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="storageMax"> <Property name="dataType">Double</Property> <Property name="label">设计仓容</Property> <Property name="label">设计储量</Property> <Property name="displayFormat">#,##0 KG</Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="storageReal"> <Property name="dataType">Double</Property> <Property name="label">实际储量</Property> <Property name="displayFormat">#,##0 KG</Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="storeType"> <Property></Property> @@ -233,10 +242,6 @@ <Property name="valueProperty">name</Property> </Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="orientation"> <Property></Property> <Property name="label">仓库朝向</Property> </PropertyDef> <PropertyDef name="foodType"> <Property></Property> @@ -260,7 +265,7 @@ <Property></Property> <Property name="label">粮食等级</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property> <Property name="mapValues">${dorado.getDataProvider("depotPR#triggerFoodLevel").getResult()}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> @@ -286,7 +291,7 @@ </PropertyDef> <PropertyDef name="storeKeeper"> <Property></Property> <Property name="label">保管员账号</Property> <Property name="label">保管员</Property> </PropertyDef> <PropertyDef name="storeKeeperName"> <Property></Property> @@ -294,7 +299,7 @@ </PropertyDef> <PropertyDef name="checkDate"> <Property name="dataType">Date</Property> <Property name="label">质检日期</Property> <Property name="label">最后质检日期</Property> </PropertyDef> <PropertyDef name="storeDate"> <Property name="dataType">Date</Property> @@ -308,21 +313,151 @@ <Property></Property> <Property name="label">备注</Property> </PropertyDef> <PropertyDef name="foodVarietyName"> </DataType> <DataType name="dtDepotStore"> <Property name="creationType">com.ld.igds.models.DepotStore</Property> <PropertyDef name="id"> <Property></Property> <Property name="label">粮食品种</Property> </PropertyDef> <PropertyDef name="foodTypeName"> <PropertyDef name="companyId"> <Property></Property> <Property name="label">组织编码</Property> </PropertyDef> <PropertyDef name="deptId"> <Property></Property> <Property name="label">所属分库</Property> </PropertyDef> <PropertyDef name="depotId"> <Property></Property> <Property name="label">所属仓库</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property> <Property name="keyProperty">id</Property> <Property name="valueProperty">name</Property> </Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="country"> <Property></Property> <Property name="label">国别</Property> </PropertyDef> <PropertyDef name="manageType"> <Property></Property> <Property name="label">管理方式</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("depotPR#triggerManagerType").getResult()}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> </PropertyDef> <PropertyDef name="storeType"> <Property></Property> <Property name="label">储粮方式</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("depotPR#triggerStoreType").getResult()}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="depotStatus"> <Property></Property> <Property name="label">货位状态</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("depotPR#triggerDepotStatus").getResult()}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="foodType"> <Property></Property> <Property name="label">粮食性质</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="depotTypeName"> <PropertyDef name="foodVariety"> <Property></Property> <Property name="label">仓库类型</Property> <Property name="label">粮食品种</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> </PropertyDef> <PropertyDef name="foodLevelName"> <PropertyDef name="foodLevel"> <Property></Property> <Property name="label">粮食等级</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("depotPR#triggerFoodLevel").getResult()}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> </PropertyDef> <PropertyDef name="foodLocationId"> <Property></Property> <Property name="label">粮食产地</Property> </PropertyDef> <PropertyDef name="foodLocation"> <Property></Property> <Property name="label">粮食产地</Property> </PropertyDef> <PropertyDef name="foodYear"> <Property></Property> <Property name="label">收货年度</Property> </PropertyDef> <PropertyDef name="storeDate"> <Property name="dataType">DateTime</Property> <Property name="label">入仓时间</Property> </PropertyDef> <PropertyDef name="storageReal"> <Property name="dataType">Double</Property> <Property name="label">实际储量</Property> <Property name="displayFormat">#,##0 KG</Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="storageSettle"> <Property name="dataType">Double</Property> <Property name="label">计价数量</Property> <Property name="displayFormat">#,##0 KG</Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="fullDate"> <Property name="dataType">Date</Property> <Property name="label">封仓日期</Property> </PropertyDef> <PropertyDef name="outDate"> <Property name="label">出仓完成时间</Property> <Property name="dataType">DateTime</Property> </PropertyDef> <PropertyDef name="grainHeight"> <Property name="dataType">Double</Property> <Property name="label">装粮线高</Property> <Property name="displayFormat">0.00 米</Property> </PropertyDef> <PropertyDef name="grainVolume"> <Property name="dataType">Double</Property> <Property name="label">装粮体积</Property> <Property name="displayFormat">0.00 立方米</Property> </PropertyDef> <PropertyDef name="remark"> <Property></Property> <Property name="label">备注</Property> </PropertyDef> <PropertyDef name="updateUser"> <Property></Property> <Property name="label">修改人</Property> </PropertyDef> <PropertyDef name="updateDate"> <Property name="dataType">Date</Property> <Property name="label">修改时间</Property> </PropertyDef> <PropertyDef name="createDate"> <Property name="dataType">Date</Property> </PropertyDef> </DataType> <DataType name="dtDevice"> @@ -1152,136 +1287,6 @@ </PropertyDef> <PropertyDef name="type"> <Property name="label">类型</Property> </PropertyDef> </DataType> <DataType name="dtDepotStore"> <Property name="creationType">com.ld.igds.models.DepotStore</Property> <PropertyDef name="id"> <Property></Property> </PropertyDef> <PropertyDef name="companyId"> <Property></Property> <Property name="label">组织编码</Property> </PropertyDef> <PropertyDef name="deptId"> <Property></Property> <Property name="label">所属分库</Property> </PropertyDef> <PropertyDef name="depotId"> <Property></Property> <Property name="label">所属仓库</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property> <Property name="keyProperty">id</Property> <Property name="valueProperty">name</Property> </Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="storeType"> <Property></Property> <Property name="label">储粮方式</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("depotPR#triggerStoreType").getResult()}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="depotStatus"> <Property></Property> <Property name="label">仓库状态</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("DEPOT_STATUS")}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="foodType"> <Property></Property> <Property name="label">粮食性质</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="foodVariety"> <Property></Property> <Property name="label">粮食品种</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="foodLevel"> <Property></Property> <Property name="label">粮食等级</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="foodLocation"> <Property></Property> <Property name="label">粮食产地</Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="foodYear"> <Property></Property> <Property name="label">收货年度</Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="storeDate"> <Property name="dataType">DateTime</Property> <Property name="label">入仓时间</Property> </PropertyDef> <PropertyDef name="storageReal"> <Property name="dataType">Double</Property> <Property name="label">实际储量</Property> <Property name="displayFormat">#,##0 KG</Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="fullDate"> <Property name="dataType">Date</Property> <Property name="label">封仓日期</Property> </PropertyDef> <PropertyDef name="outDate"> <Property name="label">出仓时间</Property> <Property name="dataType">DateTime</Property> </PropertyDef> <PropertyDef name="grainHeight"> <Property name="dataType">Double</Property> <Property name="label">装粮线高</Property> <Property name="displayFormat">0.00 米</Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="grainVolume"> <Property name="dataType">Double</Property> <Property name="label">装粮体积</Property> <Property name="displayFormat">0.00 立方米</Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="remark"> <Property></Property> <Property name="label">备注</Property> </PropertyDef> <PropertyDef name="updateUser"> <Property></Property> <Property name="label">修改人</Property> </PropertyDef> <PropertyDef name="updateDate"> <Property name="dataType">Date</Property> <Property name="label">修改时间</Property> </PropertyDef> <PropertyDef name="createDate"> <Property name="dataType">Date</Property> <Property name="label">创建时间</Property> </PropertyDef> </DataType> <DataType name="dtFileData"> igds-doc/sql/update-v35-to-v40.sql
@@ -24,3 +24,24 @@ --客户信用 RENAME TABLE D_CREDIT TO D_INTOU_CREDIT; -- 升级仓房状态 1=空仓、2=入库中、3=满仓、4=出库中、9=其他 、31气调中、32熏蒸中、33通风中 34温控中 UPDATE D_DEPOT SET DEPOT_STATUS_ = '1' WHERE DEPOT_STATUS_ ='01'; UPDATE D_DEPOT SET DEPOT_STATUS_ = '2' WHERE DEPOT_STATUS_ ='03'; UPDATE D_DEPOT SET DEPOT_STATUS_ = '3' WHERE DEPOT_STATUS_ ='02'; UPDATE D_DEPOT SET DEPOT_STATUS_ = '4' WHERE DEPOT_STATUS_ ='04'; UPDATE D_DEPOT SET DEPOT_STATUS_ = '31' WHERE DEPOT_STATUS_ ='05'; UPDATE D_DEPOT SET DEPOT_STATUS_ = '32' WHERE DEPOT_STATUS_ ='06'; UPDATE D_DEPOT SET DEPOT_STATUS_ = '33' WHERE DEPOT_STATUS_ ='07'; UPDATE D_DEPOT SET DEPOT_STATUS_ = '34' WHERE DEPOT_STATUS_ ='09'; UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '1' WHERE DEPOT_STATUS_ ='01'; UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '2' WHERE DEPOT_STATUS_ ='03'; UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '3' WHERE DEPOT_STATUS_ ='02'; UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '4' WHERE DEPOT_STATUS_ ='04'; UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '31' WHERE DEPOT_STATUS_ ='05'; UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '32' WHERE DEPOT_STATUS_ ='06'; UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '33' WHERE DEPOT_STATUS_ ='07'; UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '34' WHERE DEPOT_STATUS_ ='09';
@@ -139,8 +139,8 @@ //只有出入库状态的仓库才进行统计，其他状态表示出入库作业完成，不在执行统计 if (DepotStatus.STATUS_03.getCode().equals(lastStore.getDepotStatus()) || DepotStatus.STATUS_04.getCode().equals(lastStore.getDepotStatus())) { if (DepotStatus.STATUS_2.getCode().equals(lastStore.getDepotStatus()) || DepotStatus.STATUS_4.getCode().equals(lastStore.getDepotStatus())) { param = new InoutParam(); //param.setStart(lastStore.getCreateDate()); igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerUtils.java
@@ -3,7 +3,6 @@ import com.ld.igds.constant.*; import com.ld.igds.io.request.ExeDevice; import com.ld.igds.n2.N2ModelTag; import com.ld.igds.n2.N2Util; import com.ld.igds.util.ContextUtil; import com.ld.igds.verb.AreationModel; import org.apache.commons.lang3.StringUtils; @@ -97,15 +96,15 @@ public static String RESP_9999 = "9999";// 未知错误 //仓库状态 static String DEPOT_STATUS_1001 = "1001"; static String DEPOT_STATUS_2001 = "2001"; static String DEPOT_STATUS_3001 = "3001"; static String DEPOT_STATUS_4001 = "4001"; static String DEPOT_STATUS_5001 = "5001"; static String DEPOT_STATUS_6001 = "6001"; static String DEPOT_STATUS_7001 = "7001"; static String DEPOT_STATUS_8001 = "8001"; static String DEPOT_STATUS_9001 = "9001"; static String DEPOT_STATUS_1001 = "1001";//通风 static String DEPOT_STATUS_2001 = "2001";//气调 static String DEPOT_STATUS_3001 = "3001";//熏蒸 static String DEPOT_STATUS_4001 = "4001";//温控 static String DEPOT_STATUS_5001 = "5001";//维修 static String DEPOT_STATUS_6001 = "6001";//出库 static String DEPOT_STATUS_7001 = "7001";//入库 static String DEPOT_STATUS_8001 = "8001";//满仓 static String DEPOT_STATUS_9001 = "9001";//空仓 //设备类型 public static String DEVICE_TYPE_1 = "1";// 风窗 @@ -189,65 +188,60 @@ * @return */ public static String analysisDepotStatus(String status) { if (null == status) return null; if (status.equals(DEPOT_STATUS_1001)) { return DepotStatus.STATUS_07.getCode(); return DepotStatus.STATUS_33.getCode(); } if (status.equals(DEPOT_STATUS_2001)) { return DepotStatus.STATUS_05.getCode(); return DepotStatus.STATUS_31.getCode(); } if (status.equals(DEPOT_STATUS_3001)) { return DepotStatus.STATUS_06.getCode(); return DepotStatus.STATUS_32.getCode(); } if (status.equals(DEPOT_STATUS_4001)) { return DepotStatus.STATUS_09.getCode(); return DepotStatus.STATUS_34.getCode(); } if (status.equals(DEPOT_STATUS_5001)) { return DepotStatus.STATUS_08.getCode(); return DepotStatus.STATUS_9.getCode(); } if (status.equals(DEPOT_STATUS_6001)) { return DepotStatus.STATUS_04.getCode(); return DepotStatus.STATUS_4.getCode(); } if (status.equals(DEPOT_STATUS_7001)) { return DepotStatus.STATUS_03.getCode(); return DepotStatus.STATUS_2.getCode(); } if (status.equals(DEPOT_STATUS_8001)) { return DepotStatus.STATUS_02.getCode(); return DepotStatus.STATUS_3.getCode(); } return DepotStatus.STATUS_01.getCode(); return DepotStatus.STATUS_1.getCode(); } public static String getDepotSendStatus(String status) { if (status.equals(DepotStatus.STATUS_07.getCode())) { if (status.equals(DepotStatus.STATUS_33.getCode())) { return DEPOT_STATUS_1001; } if (status.equals(DepotStatus.STATUS_05.getCode())) { if (status.equals(DepotStatus.STATUS_31.getCode())) { return DEPOT_STATUS_2001; } if (status.equals(DepotStatus.STATUS_06.getCode())) { if (status.equals(DepotStatus.STATUS_32.getCode())) { return DEPOT_STATUS_3001; } if (status.equals(DepotStatus.STATUS_09.getCode())) { if (status.equals(DepotStatus.STATUS_34.getCode())) { return DEPOT_STATUS_4001; } if (status.equals(DepotStatus.STATUS_08.getCode())) { if (status.equals(DepotStatus.STATUS_9.getCode())) { return DEPOT_STATUS_5001; } if (status.equals(DepotStatus.STATUS_04.getCode())) { if (status.equals(DepotStatus.STATUS_4.getCode())) { return DEPOT_STATUS_6001; } if (status.equals(DepotStatus.STATUS_03.getCode())) { if (status.equals(DepotStatus.STATUS_2.getCode())) { return DEPOT_STATUS_7001; } if (status.equals(DepotStatus.STATUS_02.getCode())) { if (status.equals(DepotStatus.STATUS_3.getCode())) { return DEPOT_STATUS_8001; } return DepotStatus.STATUS_01.getCode(); return DepotStatus.STATUS_1.getCode(); } /**
