高压MES-物料推送-字段取值优化
This commit is contained in:
		
							parent
							
								
									f709537079
								
							
						
					
					
						commit
						6930bf0197
					
				|  | @ -118,11 +118,10 @@ public class MaterialToGyMesListener implements IBusinessListener { | |||
|             singleObj.put("specification", vo.getMaterialspec()); // 规格 | ||||
|             singleObj.put("model", vo.getMaterialtype()); // 型号文字 | ||||
|             singleObj.put("intervalModel", vo.getMaterialtype()); // 产品类型 例如35-KV-断路器(物料自定义字段) | ||||
|             singleObj.put("primaryUnit", unitMap.get("measrate").toString().split("/")[0]); | ||||
|             // 主单位 | ||||
|             singleObj.put("materialUnit", unitMap.get("measrate").toString().split("/")[1]); // 单位 | ||||
|             singleObj.put("primaryUnit", unitMap.get("unitname")); | ||||
|             singleObj.put("materialUnit", unitMap.get("unitname")); | ||||
| 
 | ||||
| //            singleObj.put("drawingNumber", vo.getGraphid()); // 图号编码 | ||||
|             singleObj.put("drawingNumber", drawingNumber); | ||||
|             singleObj.put("enableStatus", enablestate - 1); // 启用状态 0 未启动 1 已启动 2 已停用 | ||||
|             singleObj.put("materialType", stockMap.get("martype")); // 物料类型编码 | ||||
|  | @ -132,7 +131,7 @@ public class MaterialToGyMesListener implements IBusinessListener { | |||
|             singleObj.put("reservation", stockMap.get("remain")); // 预留 | ||||
|             singleObj.put("virtualItem", isvirtual.toString()); // 虚项 | ||||
|             if (prodMap != null && !prodMap.isEmpty()) { | ||||
|                 singleObj.put("productionDepartment", prodMap.get("deptCode")); // 生产部门编码 | ||||
|                 singleObj.put("productionDepartment", prodMap.get("deptcode")); // Éú˛ú˛żĂĹąŕÂë | ||||
|                 singleObj.put("matchingComponents", prodMap.get("iscreatesonprodorder")); // 配套子件 | ||||
|                 singleObj.put("issuance", prodMap.get("issend")); // 发料 | ||||
|                 singleObj.put("backflushMethod", prodMap.get("conversemethod")); // 倒冲方式 | ||||
|  | @ -204,7 +203,7 @@ public class MaterialToGyMesListener implements IBusinessListener { | |||
|     } | ||||
| 
 | ||||
|     private Map getGoodsInfo(String pkMaterial) throws BusinessException { | ||||
|         String sql = " select a.pk_measdoc, c.name unitname, b.pk_measdoc deputyUnit, d.name deputy_unitname, nvl(b.measrate, '1/1') measrate " + | ||||
|         String sql = " select a.pk_measdoc, c.name unitname, b.pk_measdoc deputyunit, d.name deputy_unitname, nvl(b.measrate, '1/1') measrate " + | ||||
|                 "from bd_material a " + | ||||
|                 "left join bd_materialconvert b on a.pk_material = b.pk_material " + | ||||
|                 "left join bd_measdoc c on a.pk_measdoc = c.pk_measdoc " + | ||||
|  | @ -224,10 +223,8 @@ public class MaterialToGyMesListener implements IBusinessListener { | |||
|     } | ||||
| 
 | ||||
|     private Map getProdInfo(String pkMaterial) throws BusinessException { | ||||
|         String sql = "SELECT b.code deptCode, a.iscreatesonprodorder, a.issend, a.conversemethod, a.converstime, a.wghxcl" + | ||||
|                 " pk_materialprod " + | ||||
|                 "FROM " + | ||||
|                 " bd_materialprod a" + | ||||
|         String sql = "SELECT b.code deptcode, a.iscreatesonprodorder, a.issend, a.conversemethod, a.converstime, a.wghxcl" + | ||||
|                 " FROM bd_materialprod a" + | ||||
|                 " left join org_dept b on a.pk_prodeptdoc = b.pk_dept " + | ||||
|                 " where a.pk_material = '" + pkMaterial + "' " + " and a.pk_org = '" + orgId + "' "; | ||||
|         Map map = (Map) new BaseDAO().executeQuery(sql, new MapProcessor()); | ||||
|  |  | |||
|  | @ -153,9 +153,9 @@ public class MaterialToGyMesListener implements IBusinessListener { | |||
|             singleObj.put("specification", vo.getMaterialspec()); // 规格 | ||||
|             singleObj.put("model", vo.getMaterialtype()); // 型号文字 | ||||
|             singleObj.put("intervalModel", vo.getMaterialtype()); // 产品类型 例如35-KV-断路器(物料自定义字段) | ||||
|             singleObj.put("primaryUnit", unitMap.get("measrate").toString().split("/")[0]); | ||||
|             // 主单位 | ||||
|             singleObj.put("materialUnit", unitMap.get("measrate").toString().split("/")[1]); // µ¥Î» | ||||
|             singleObj.put("primaryUnit", unitMap.get("unitname")); | ||||
|             singleObj.put("materialUnit", unitMap.get("unitname")); | ||||
| //            singleObj.put("drawingNumber", vo.getGraphid()); // 图号编码 | ||||
|             singleObj.put("drawingNumber", drawingNumber); | ||||
|             singleObj.put("enableStatus", enablestate - 1); // 启用状态 0 未启动 1 已启动 2 已停用 | ||||
|  | @ -166,7 +166,7 @@ public class MaterialToGyMesListener implements IBusinessListener { | |||
|             singleObj.put("reservation", stockMap.get("remain")); // 预留 | ||||
|             singleObj.put("virtualItem", isvirtual.toString()); // 虚项 | ||||
|             if (prodMap != null && !prodMap.isEmpty()) { | ||||
|                 singleObj.put("productionDepartment", prodMap.get("deptCode")); // Éú²ú²¿ÃűàÂë | ||||
|                 singleObj.put("productionDepartment", prodMap.get("deptcode")); // Éú˛ú˛żĂĹąŕÂë | ||||
|                 singleObj.put("matchingComponents", prodMap.get("iscreatesonprodorder")); // 配套子件 | ||||
|                 singleObj.put("issuance", prodMap.get("issend")); // 发料 | ||||
|                 singleObj.put("backflushMethod", prodMap.get("conversemethod")); // 倒冲方式 | ||||
|  | @ -286,7 +286,7 @@ public class MaterialToGyMesListener implements IBusinessListener { | |||
|     } | ||||
| 
 | ||||
|     private Map getGoodsInfo(String pkMaterial) throws BusinessException { | ||||
|         String sql = " select a.pk_measdoc, c.name unitname, b.pk_measdoc deputyUnit, d.name deputy_unitname, nvl(b.measrate, '1/1') measrate " + | ||||
|         String sql = " select a.pk_measdoc, c.name unitname, b.pk_measdoc deputyunit, d.name deputy_unitname, nvl(b.measrate, '1/1') measrate " + | ||||
|                 "from bd_material a " + | ||||
|                 "left join bd_materialconvert b on a.pk_material = b.pk_material " + | ||||
|                 "left join bd_measdoc c on a.pk_measdoc = c.pk_measdoc " + | ||||
|  | @ -306,10 +306,8 @@ public class MaterialToGyMesListener implements IBusinessListener { | |||
|     } | ||||
| 
 | ||||
|     private Map getProdInfo(String pkMaterial) throws BusinessException { | ||||
|         String sql = "SELECT b.code deptCode, a.iscreatesonprodorder, a.issend, a.conversemethod, a.converstime, a.wghxcl" + | ||||
|                 " pk_materialprod " + | ||||
|                 "FROM " + | ||||
|                 " bd_materialprod a" + | ||||
|         String sql = "SELECT b.code deptcode, a.iscreatesonprodorder, a.issend, a.conversemethod, a.converstime, a.wghxcl" + | ||||
|                 " FROM bd_materialprod a" + | ||||
|                 " left join org_dept b on a.pk_prodeptdoc = b.pk_dept " + | ||||
|                 " where a.pk_material = '" + pkMaterial + "' " + " and a.pk_org = '" + orgId + "' "; | ||||
|         Map map = (Map) new BaseDAO().executeQuery(sql, new MapProcessor()); | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue