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

是否恒温恒湿，是否熟化修改

Browse Source
This commit is contained in:
王帅 2025-05-21 16:13:04 +08:00
parent e6b315c7e1
commit 1cf744be5b
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -428,7 +428,7 @@ public class ProductIntoServiceImpl implements FGStockInService {
MaterialSpecKey materialSpecKey = new MaterialSpecKey(); MaterialSpecKey materialSpecKey = new MaterialSpecKey();
materialSpecKey.setMaterialSpecName(materialSpecName); materialSpecKey.setMaterialSpecName(materialSpecName);
materialSpecKey.setSiteName(siteName); materialSpecKey.setSiteName(siteName);
String is_oven = "N"; String is_oven = "";
materialSpec = MaterialServiceProxy.getMaterialSpecService() materialSpec = MaterialServiceProxy.getMaterialSpecService()
.selectByKey(materialSpecKey); .selectByKey(materialSpecKey);
String maturationflag = materialSpec.getMATURATIONFLAG();//熟化标识 String maturationflag = materialSpec.getMATURATIONFLAG();//熟化标识
@ -458,17 +458,17 @@ public class ProductIntoServiceImpl implements FGStockInService {
throw new RuntimeException("仓库与货位对应关系不正确"); throw new RuntimeException("仓库与货位对应关系不正确");
} }
} }
String ckhw = "Y".equals(const_temp) ? "恒温恒湿" : "非恒温恒湿"; String ckhw = "02".equals(const_temp) ? "恒温恒湿" : "非恒温恒湿";
String wlhw = "01".equals(is_CON_TEMP) ? "恒温恒湿" : "非恒温恒湿"; String wlhw = "02".equals(is_CON_TEMP) ? "恒温恒湿" : "非恒温恒湿";
String cksh = "Y".equals(is_oven) ? "熟化" : "非熟化"; String cksh = "03".equals(is_oven) || "04".equals(is_oven) ? "熟化" : "非熟化";
String wlsh = "01".equals(maturationflag) ? "熟化" : "非熟化"; String wlsh = "03".equals(maturationflag) || "04".equals(maturationflag) ? "熟化" : "非熟化";
//物料非熟化 不能进熟化仓 //物料非熟化 不能进熟化仓
if ("01".equals(maturationflag)) { if ("03".equals(maturationflag) || "04".equals(maturationflag)) {
} else { //非熟化逻辑 } else { //非熟化逻辑
if ("Y".equals(is_oven)) { if ("03".equals(is_oven) || "04".equals(is_oven)) {
throw new RuntimeException("仓库" + cksh + "; 物料" + wlsh); throw new RuntimeException("仓库" + cksh + "; 物料" + wlsh);
} }
} }
@ -476,14 +476,14 @@ 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 ("01".equals(is_CON_TEMP)) { if ("02".equals(is_CON_TEMP)) {
if ("Y".equals(const_temp) || "Y".equals(is_oven)) { if ("02".equals(const_temp) || "03".equals(is_oven) || "04".equals(is_oven)) {
} else { } else {
throw new RuntimeException("仓库" + ckhw + "; 物料" + wlhw); throw new RuntimeException("仓库" + ckhw + "; 物料" + wlhw);
} }
} else { //物料非恒温 不能进恒温仓 } else { //物料非恒温 不能进恒温仓
if ("Y".equals(const_temp)) { if ("02".equals(const_temp)) {
throw new RuntimeException("仓库" + ckhw + "; 物料" + wlhw); throw new RuntimeException("仓库" + ckhw + "; 物料" + wlhw);
} }
} }
@ -555,7 +555,7 @@ public class ProductIntoServiceImpl implements FGStockInService {
bindMap.put("SALESPERSON", queryForList.get(0).get("SALESPERSON"));//事业部 bindMap.put("SALESPERSON", queryForList.get(0).get("SALESPERSON"));//事业部
bindMap.put("MJPC", queryForList.get(0).get("MJPC"));//母卷批次 bindMap.put("MJPC", queryForList.get(0).get("MJPC"));//母卷批次
bindMap.put("remark", queryForList.get(0).get("REMARK"));//备注 bindMap.put("remark", queryForList.get(0).get("REMARK"));//备注
if("Y".equals(is_oven)) { if("03".equals(is_oven) || "04".equals(is_oven)) {
bindMap.put("MATURATIONINTIME", eventInfo.getEventTime());//熟化入库时间 bindMap.put("MATURATIONINTIME", eventInfo.getEventTime());//熟化入库时间
} }
@ -645,7 +645,7 @@ public class ProductIntoServiceImpl implements FGStockInService {
MaterialSpecKey materialSpecKey = new MaterialSpecKey(); MaterialSpecKey materialSpecKey = new MaterialSpecKey();
materialSpecKey.setMaterialSpecName(materialSpecName); materialSpecKey.setMaterialSpecName(materialSpecName);
materialSpecKey.setSiteName(siteName); materialSpecKey.setSiteName(siteName);
String is_oven = "N"; String is_oven = "";
materialSpec = MaterialServiceProxy.getMaterialSpecService() materialSpec = MaterialServiceProxy.getMaterialSpecService()
.selectByKey(materialSpecKey); .selectByKey(materialSpecKey);
String maturationflag = materialSpec.getMATURATIONFLAG();//熟化标识 String maturationflag = materialSpec.getMATURATIONFLAG();//熟化标识
@ -774,7 +774,7 @@ public class ProductIntoServiceImpl implements FGStockInService {
bindMap.put("remark", queryForList.get(0).get("REMARK"));//备注 bindMap.put("remark", queryForList.get(0).get("REMARK"));//备注
bindMap.put("materialPackingType", "Box"); bindMap.put("materialPackingType", "Box");
if("Y".equals(is_oven)) { if("03".equals(is_oven) || "04".equals(is_oven)) {
bindMap.put("MATURATIONINTIME", eventInfo.getEventTime());//熟化入库时间 bindMap.put("MATURATIONINTIME", eventInfo.getEventTime());//熟化入库时间
} }
String saleShipRequestName = queryForList.get(0).get("SALESHIPREQUESTNAME") == null ? "" : queryForList.get(0).get("SALESHIPREQUESTNAME").toString(); String saleShipRequestName = queryForList.get(0).get("SALESHIPREQUESTNAME") == null ? "" : queryForList.get(0).get("SALESHIPREQUESTNAME").toString();

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='01' "; String DetailSql = "SELECT IS_CON_TEMP FROM MATERIALSPEC m WHERE MATERIALSPECNAME =:MATERIALSPECNAME AND IS_CON_TEMP='02' ";
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);

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

@ -140,7 +140,7 @@ public class MaterialPackingServiceImpl extends
// EveryBoxQuantity1 = (float) (tempV / 100.00); // EveryBoxQuantity1 = (float) (tempV / 100.00);
// float num=(float)(Math.round(totalPrice*100)/100) // float num=(float)(Math.round(totalPrice*100)/100)
// } // }
String is_oven = "N"; String is_oven = "";
MaterialSpec materialSpec = new MaterialSpec(); MaterialSpec materialSpec = new MaterialSpec();
MaterialSpecKey materialSpecKey = new MaterialSpecKey(); MaterialSpecKey materialSpecKey = new MaterialSpecKey();
materialSpecKey.setMaterialSpecName(materialSpecName); materialSpecKey.setMaterialSpecName(materialSpecName);
@ -251,7 +251,7 @@ public class MaterialPackingServiceImpl extends
// bindMap.put("fqty", fqty); // bindMap.put("fqty", fqty);
bindMap.put("truegg", truegg); bindMap.put("truegg", truegg);
bindMap.put("remark", remark); bindMap.put("remark", remark);
if("Y".equals(is_oven)) { if("03".equals(is_oven) || "04".equals(is_oven)) {
bindMap.put("MATURATIONINTIME", eventInfo.getEventTime()); bindMap.put("MATURATIONINTIME", eventInfo.getEventTime());
} }
// bindMap.put("receiveRequestName", shipRequestName); // bindMap.put("receiveRequestName", shipRequestName);
@ -6537,7 +6537,7 @@ public void updateComplete(EventInfo eventInfo,String siteName,String invoiceNo,
EveryBoxQuantity1 = (BigDecimal) (tempV.divide(new BigDecimal(100.00))); EveryBoxQuantity1 = (BigDecimal) (tempV.divide(new BigDecimal(100.00)));
// float num=(float)(Math.round(totalPrice*100)/100) // float num=(float)(Math.round(totalPrice*100)/100)
} }
String is_oven = "N"; String is_oven = "";
MaterialSpec materialSpec = new MaterialSpec(); MaterialSpec materialSpec = new MaterialSpec();
MaterialSpecKey materialSpecKey = new MaterialSpecKey(); MaterialSpecKey materialSpecKey = new MaterialSpecKey();
materialSpecKey.setMaterialSpecName(materialSpecName); materialSpecKey.setMaterialSpecName(materialSpecName);
@ -6572,12 +6572,12 @@ public void updateComplete(EventInfo eventInfo,String siteName,String invoiceNo,
throw new RuntimeException("仓库与货位对应关系不正确"); throw new RuntimeException("仓库与货位对应关系不正确");
} }
} }
String ckhw = "Y".equals(const_temp) ? "恒温恒湿" : "非恒温恒湿"; String ckhw = "02".equals(const_temp) ? "恒温恒湿" : "非恒温恒湿";
String wlhw = "01".equals(is_CON_TEMP) ? "恒温恒湿" : "非恒温恒湿"; String wlhw = "02".equals(is_CON_TEMP) ? "恒温恒湿" : "非恒温恒湿";
String cksh = "Y".equals(is_oven) ? "熟化" : "非熟化"; String cksh = "03".equals(is_oven) || "04".equals(is_oven) ? "熟化" : "非熟化";
String wlsh = "01".equals(maturationflag) ? "熟化" : "非熟化"; String wlsh = "03".equals(maturationflag) || "04".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);
// } // }
@ -6646,7 +6646,7 @@ public void updateComplete(EventInfo eventInfo,String siteName,String invoiceNo,
bindMap.put("SALESPERSON", SALESPERSON); bindMap.put("SALESPERSON", SALESPERSON);
bindMap.put("CAREER_ASSISTANCE", CAREER_ASSISTANCE); bindMap.put("CAREER_ASSISTANCE", CAREER_ASSISTANCE);
bindMap.put("BUSINESS_UNIT", BUSINESS_UNIT); bindMap.put("BUSINESS_UNIT", BUSINESS_UNIT);
if("Y".equals(is_oven)) { if("03".equals(is_oven) || "04".equals(is_oven)) {
bindMap.put("MATURATIONINTIME", eventInfo.getEventTime()); bindMap.put("MATURATIONINTIME", eventInfo.getEventTime());
} }
// bindMap.put("receiveRequestName", shipRequestName); // bindMap.put("receiveRequestName", shipRequestName);