10539622/2025-03-JS-SDK-svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

是否恒温恒湿、是否熟化由Y改为01

Browse Source
This commit is contained in:
王帅 2025-05-15 09:51:44 +08:00
parent 986382f077
commit a0d1bd69cf
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java
View File

@ -458,13 +458,13 @@ public class ProductIntoServiceImpl implements FGStockInService {
} }
} }
String ckhw = "Y".equals(const_temp) ? "恒温恒湿" : "非恒温恒湿"; String ckhw = "Y".equals(const_temp) ? "恒温恒湿" : "非恒温恒湿";
String wlhw = "Y".equals(is_CON_TEMP) ? "恒温恒湿" : "非恒温恒湿"; String wlhw = "01".equals(is_CON_TEMP) ? "恒温恒湿" : "非恒温恒湿";
String cksh = "Y".equals(is_oven) ? "熟化" : "非熟化"; String cksh = "Y".equals(is_oven) ? "熟化" : "非熟化";
String wlsh = "Y".equals(maturationflag) ? "熟化" : "非熟化"; String wlsh = "01".equals(maturationflag) ? "熟化" : "非熟化";
//物料非熟化 不能进熟化仓 //物料非熟化 不能进熟化仓
if ("Y".equals(maturationflag)) { if ("01".equals(maturationflag)) {
} else { //非熟化逻辑 } else { //非熟化逻辑
if ("Y".equals(is_oven)) { if ("Y".equals(is_oven)) {
@ -475,7 +475,7 @@ public class ProductIntoServiceImpl implements FGStockInService {
//物料恒温 只能进恒温仓或熟化仓 2024.11 //物料恒温 只能进恒温仓或熟化仓 2024.11
String packingGrade = queryForList.get(0).get("PACKINGGRADE") == null ? "" : queryForList.get(0).get("PACKINGGRADE").toString(); String packingGrade = queryForList.get(0).get("PACKINGGRADE") == null ? "" : queryForList.get(0).get("PACKINGGRADE").toString();
if (!"NG".equals(packingGrade)) { if (!"NG".equals(packingGrade)) {
if ("Y".equals(is_CON_TEMP)) { if ("01".equals(is_CON_TEMP)) {
if ("Y".equals(const_temp) || "Y".equals(is_oven)) { if ("Y".equals(const_temp) || "Y".equals(is_oven)) {
} else { } else {

2
zi-wms-pda/src/main/java/com/cim/idm/utils/CommonUtils.java
View File

@ -127,7 +127,7 @@ public class CommonUtils {
*/ */
public Boolean JudgeMentERPLocationAndMaterialSpec(String ERPLOcxation,String materialSpec) public Boolean JudgeMentERPLocationAndMaterialSpec(String ERPLOcxation,String materialSpec)
{ {
String DetailSql = "SELECT IS_CON_TEMP FROM MATERIALSPEC m WHERE MATERIALSPECNAME =:MATERIALSPECNAME AND IS_CON_TEMP='Y' "; String DetailSql = "SELECT IS_CON_TEMP FROM MATERIALSPEC m WHERE MATERIALSPECNAME =:MATERIALSPECNAME AND IS_CON_TEMP='01' ";
Map<String, Object> DetailMap = new HashMap<String, Object>(); Map<String, Object> DetailMap = new HashMap<String, Object>();
DetailMap.put("MATERIALSPECNAME",materialSpec ); DetailMap.put("MATERIALSPECNAME",materialSpec );
List<Map<String,Object>> ShipDetaillist = IDMFrameServiceProxy.getSqlTemplate().queryForList(DetailSql, DetailMap); List<Map<String,Object>> ShipDetaillist = IDMFrameServiceProxy.getSqlTemplate().queryForList(DetailSql, DetailMap);

4
zi-wms-service/src/main/java/com/cim/idm/mwmsextend/materialpacking/service/MaterialPackingServiceImpl.java
View File

@ -6573,11 +6573,11 @@ public void updateComplete(EventInfo eventInfo,String siteName,String invoiceNo,
} }
} }
String ckhw = "Y".equals(const_temp) ? "恒温恒湿" : "非恒温恒湿"; String ckhw = "Y".equals(const_temp) ? "恒温恒湿" : "非恒温恒湿";
String wlhw = "Y".equals(is_CON_TEMP) ? "恒温恒湿" : "非恒温恒湿"; String wlhw = "01".equals(is_CON_TEMP) ? "恒温恒湿" : "非恒温恒湿";
String cksh = "Y".equals(is_oven) ? "熟化" : "非熟化"; String cksh = "Y".equals(is_oven) ? "熟化" : "非熟化";
String wlsh = "Y".equals(maturationflag) ? "熟化" : "非熟化"; String wlsh = "01".equals(maturationflag) ? "熟化" : "非熟化";
// if (!const_temp.equals(is_CON_TEMP)) { // if (!const_temp.equals(is_CON_TEMP)) {
// throw new RuntimeException("仓库" + ckhw + "; 物料" + wlhw); // throw new RuntimeException("仓库" + ckhw + "; 物料" + wlhw);
// } // }