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

fix:修改退料入库

Browse Source
This commit is contained in:
郭飞 2025-04-16 16:48:54 +08:00
parent 44105d1e74
commit c760462578
8 changed files with 63 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequest/management/data/MaterialShipRequest.java
View File

@ -69,6 +69,7 @@ public class MaterialShipRequest extends FieldAccessor implements DataInfo<Mater
private String erpReceiveLocation;
private String exportNo;
private String erpFactoryName;
private String areaName;
private String saleReason;
@ -317,4 +318,12 @@ public class MaterialShipRequest extends FieldAccessor implements DataInfo<Mater
public void setErpFactory(String erpFactory) {
this.erpFactory = erpFactory;
}
public String getAreaName() {
return areaName;
}
public void setAreaName(String areaName) {
this.areaName = areaName;
}
}

43
zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
View File

@ -321,6 +321,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("FGStockIn");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(makeFGStockIn);
erplog.setSendMsg2(makeFGStockIn);
erplog.setSendMsg(makeFGStockIn);
erplog.setReturnMsg2(sapreturn);
@ -367,6 +368,7 @@ public class ToSAPServiceImpl {
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
// erplog.setMessageId(undoId);
erplog.setMessageId(undoId);
erplog.setSendMsg(makeFGStockIn);
erplog.setSendMsg2(makeFGStockIn);
erplog.setSendMsg(makeFGStockIn);
erplog.setReturnMsg2(sapreturn);
@ -429,6 +431,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("FGStockIn");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(RECEIVEACTNO);
erplog.setSendMsg(makeFGStockIn);
erplog.setSendMsg2(makeFGStockIn);
erplog.setSendMsg(makeFGStockIn);
erplog.setReturnMsg2(sapreturn);
@ -486,6 +489,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("FGStockIn");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId("");
erplog.setSendMsg(bodyJson);
erplog.setSendMsg2(bodyJson);
erplog.setSendMsg(bodyJson);
erplog.setReturnMsg2(sapreturn);
@ -551,6 +555,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("CancelFGStockIn");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
//erplog.setMessageId(RECEIVEACTNO);
erplog.setSendMsg(makeCancelFGStockIn);
erplog.setSendMsg2(makeCancelFGStockIn);
erplog.setSendMsg(makeCancelFGStockIn);
erplog.setReturnMsg2(sapreturn);
@ -878,6 +883,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("qtr");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(reActo);
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -959,6 +965,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("AlloctionStockIn");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(shipRequestName);
erplog.setSendMsg(makeAlloctionStockIn);
erplog.setSendMsg2(makeAlloctionStockIn);
erplog.setSendMsg(makeAlloctionStockIn);
erplog.setReturnMsg2(sapreturn);
@ -1108,6 +1115,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("AlloctionStockIn");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(shipRequestName);
erplog.setSendMsg(makeAlloctionStockIn);
erplog.setSendMsg2(makeAlloctionStockIn);
erplog.setSendMsg(makeAlloctionStockIn);
erplog.setReturnMsg2(sapreturn);
@ -1306,6 +1314,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("调拨出库(NLCC)");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -1424,6 +1433,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("SaleReturn");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(shipRequestName);
erplog.setSendMsg(makeReturnMaterials);
erplog.setSendMsg2(makeReturnMaterials);
erplog.setSendMsg(makeReturnMaterials);
erplog.setReturnMsg2(sapreturn);
@ -1882,6 +1892,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("生产领料出库261/311");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -2469,7 +2480,8 @@ public class ToSAPServiceImpl {
}
log.info("SendTOSAP >>>>" + sendData);
String sapreturn = toSAPMessageUtil.sendHttpPost(toSAPMessageUtil.materialChangeLocationUrl, "", sendData.toJSONString());
String sendDatas = sendData.toJSONString();
String sapreturn = toSAPMessageUtil.sendHttpPost(toSAPMessageUtil.materialChangeLocationUrl, "", sendDatas);
org.json.JSONObject receiveJsonObject = new org.json.JSONObject(sapreturn);
org.json.JSONObject returnJsonObject = (org.json.JSONObject) receiveJsonObject.get("RETURN");
rcode = returnJsonObject.get("STATUS").toString();
@ -2485,6 +2497,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("MES物料消耗261");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -2645,6 +2658,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("成本中心领料出库201");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -2804,6 +2818,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("研发（内部订单）领料出库Z61");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -2940,6 +2955,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("销售出库");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -3078,6 +3094,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("调拨出库(NLCC)");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -3212,6 +3229,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("调拨出库(NLCC)");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -3346,6 +3364,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("调拨出库(NLCC)");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -3502,6 +3521,7 @@ public class ToSAPServiceImpl {
erplog.setId(uuid.toString());
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -3629,6 +3649,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("盘点");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -3795,6 +3816,7 @@ public class ToSAPServiceImpl {
erplog.setId(uuid.toString());
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -3958,6 +3980,7 @@ public class ToSAPServiceImpl {
erplog.setId(uuid.toString());
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -4107,6 +4130,7 @@ public class ToSAPServiceImpl {
erplog.setId(uuid.toString());
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -4270,6 +4294,7 @@ public class ToSAPServiceImpl {
erplog.setId(uuid.toString());
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -4418,6 +4443,7 @@ public class ToSAPServiceImpl {
erplog.setId(uuid.toString());
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -4552,6 +4578,7 @@ public class ToSAPServiceImpl {
erplog.setId(uuid.toString());
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -4674,6 +4701,7 @@ public class ToSAPServiceImpl {
erplog.setId(uuid.toString());
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData.toJSONString());
erplog.setSendMsg2(sendData.toJSONString());
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);
@ -4698,20 +4726,20 @@ public class ToSAPServiceImpl {
*/
public String ReturnStockInNew(String siteName, String eventUser, String shipRequestName, String commitDate, String opCode) throws Exception {
String sql="SELECT T.RECEIVEREQUESTNAME ," + SystemPropHelper.CR+
" T.PRODUCTORDER," +SystemPropHelper.CR+
" D.REQUESTNAME PRODUCTORDER," +SystemPropHelper.CR+
" T.ERPFACTORY, " + SystemPropHelper.CR+
" T.ERPLOCATION, " + SystemPropHelper.CR+
" T.MATERIALSPECNAME, " + SystemPropHelper.CR+
" T.UNIT, " + SystemPropHelper.CR+
" T.PACKINGGRADE," + SystemPropHelper.CR+
" SUM(T.MATERIALQUANTITY) AS MATERIALQUANTITY" + SystemPropHelper.CR+
" FROM MATERIALPACKING T " + SystemPropHelper.CR+
" FROM MATERIALPACKING T LEFT JOIN BS_MES_SHIPPED D ON D.LOTNAME = T.MATERIALPACKINGNAME" + SystemPropHelper.CR+
" WHERE 1 = 1 " + SystemPropHelper.CR+
" AND T.receiveActNo = :SHIPREQUESTNAME" + SystemPropHelper.CR+
" AND T.SITENAME = :SITENAME " + SystemPropHelper.CR+
" AND T.STOCKSTATE = 'Created' " + SystemPropHelper.CR+
"GROUP BY T.RECEIVEREQUESTNAME, T.PRODUCTORDER, T.ERPFACTORY,T.ERPLOCATION, " + SystemPropHelper.CR+
" T.MATERIALSPECNAME,T.UNIT,PACKINGGRADE ";
"GROUP BY T.RECEIVEREQUESTNAME, D.REQUESTNAME, T.ERPFACTORY,T.ERPLOCATION, " + SystemPropHelper.CR+
" T.MATERIALSPECNAME,T.UNIT,T.PACKINGGRADE ";
Map<String, Object> hashMap = new HashMap<String, Object>();
hashMap.put("SITENAME", siteName);
// hashMap.put("SHIPREQUESTNAME", shipRequestName);
@ -4746,6 +4774,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("ReturnStockIn");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(shipRequestName);
erplog.setSendMsg(makeReturnStockIn);
erplog.setSendMsg2(makeReturnStockIn);
erplog.setSendMsg(makeReturnStockIn);
erplog.setReturnMsg2(sapreturn);
@ -4884,6 +4913,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("PurStockIn");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(shipRequestName);
erplog.setSendMsg(moveLibraryInfo);
erplog.setSendMsg2(moveLibraryInfo);
erplog.setSendMsg(moveLibraryInfo);
erplog.setReturnMsg2(sapreturn);
@ -4956,6 +4986,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("PurStockIn");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(shipRequestName);
erplog.setSendMsg(moveLibraryInfo);
erplog.setSendMsg2(moveLibraryInfo);
erplog.setSendMsg(moveLibraryInfo);
erplog.setReturnMsg2(sapreturn);
@ -5130,6 +5161,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("iqcResultFeekback");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData);
erplog.setSendMsg2(sendData);
erplog.setSendMsg(sendData);
erplog.setReturnMsg2(sapreturn);
@ -5228,6 +5260,7 @@ public class ToSAPServiceImpl {
erplog.setEventName("QMSResultFeekback");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(UUID.randomUUID().toString());
erplog.setSendMsg(sendData);
erplog.setSendMsg2(sendData);
erplog.setReturnMsg2(sapreturn);
erplog.setResultCode(rcode);

6
zi-wms-pda/src/main/java/com/cim/idm/controller/ProduceReturnController.java
View File

@ -201,8 +201,12 @@ public class ProduceReturnController {
public AjaxResult getShipCode(@RequestBody JSONObject in ){
MaterialPacking materialPacking = JSON.toJavaObject(in, MaterialPacking.class);
String materialPackingName = materialPacking.getMaterialPackingName();
String erpLocation = materialPacking.getErpLocation();
String erpFactory = materialPacking.getErpFactory();
String locationName = materialPacking.getLocationName();
String materialSpecName = materialPacking.getMaterialSpecName();
// 查看标签
List<Map<String, Object>> list2 = produceReturnService.getMaterialPacking(materialPackingName);
List<Map<String, Object>> list2 = produceReturnService.getMaterialPacking(materialPackingName, erpLocation, erpFactory, locationName);
// 判断条码是否存在且状态是在库
if (list2.size() > 1) {
throw new GlobalException("条码不止一个！");

3
zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java
View File

@ -999,6 +999,7 @@ public class SAPToWMSController {
String createDate = MapUtils.getString(data, "CRDAT"); // 创建日期
String createTime = MapUtils.getString(data, "CRTIM"); // 创建时间
String moveState = MapUtils.getString(data, "BWART"); //移动类型 BWART
String areaName = MapUtils.getString(data, "AREANAME"); //车间
String sqlCheck =" SELECT * FROM materialshiprequest m WHERE shiprequestname =:SHIPREQUESTNAME ";
Map<String, Object> selectMap= new HashMap<String, Object>();
selectMap.put("SHIPREQUESTNAME", shipRequestName);
@ -1017,6 +1018,7 @@ public class SAPToWMSController {
bindMap.put("createUser", createUser);
bindMap.put("createTime", createDate+" "+createTime);
bindMap.put("erpFactory", erpFactory);
bindMap.put("areaName", areaName);
createInfo.setUserColumns(bindMap);
EventInfo eventInfo = new EventInfo();
@ -1043,6 +1045,7 @@ public class SAPToWMSController {
bindMap.put("createUser", createUser);
bindMap.put("createTime", createTime);
bindMap.put("erpFactory", erpFactory);
bindMap.put("areaName", areaName);
info.setUserColumns(bindMap);

2
zi-wms-pda/src/main/java/com/cim/idm/dao/ProduceReturnDao.java
View File

@ -18,7 +18,7 @@ public interface ProduceReturnDao {
* @return 物料数据
*/
@MapKey("materialPacking")
List<Map<String,Object>> getMaterialPacking(@Param("name") String materialPackingName);
List<Map<String,Object>> getMaterialPacking(@Param("name") String materialPackingName, @Param("erpLocation") String erpLocation, @Param("erpFactory") String erpFactory, @Param("locationName") String locationName);
/**
* 获取 mes-ship 表

2
zi-wms-pda/src/main/java/com/cim/idm/service/IProduceReturnService.java
View File

@ -11,7 +11,7 @@ public interface IProduceReturnService {
* @param materialPackingName 码
* @return 物料数据
*/
List<Map<String,Object>> getMaterialPacking(String materialPackingName);
List<Map<String,Object>> getMaterialPacking(String materialPackingName, String erpLocation, String erpFactory, String locationName);
/**
* 获取 mes-ship 表

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

@ -15,8 +15,8 @@ public class ProduceReturnServiceImpl implements IProduceReturnService {
private ProduceReturnDao produceReturnDao;
@Override
public List<Map<String, Object>> getMaterialPacking(String materialPackingName) {
return produceReturnDao.getMaterialPacking(materialPackingName);
public List<Map<String, Object>> getMaterialPacking(String materialPackingName, String erpLocation, String erpFactory, String locationName) {
return produceReturnDao.getMaterialPacking(materialPackingName, erpLocation, erpFactory, locationName);
}
@Override

3
zi-wms-pda/src/main/resources/com/cim/idm/dao/ProduceReturnDao.xml
View File

@ -5,7 +5,8 @@
<select id="getMaterialPacking" resultType="map">
SELECT mp.MATERIALPACKINGNAME, mp.MATERIALSPECNAME, mp.PHASE, mp.PACKINGGRADE,
mp.STOCKSTATE, mp.RECEIVEACTNO, mp.CHARGE, m.DESC_CN,
mp.STOCKSTATE, mp.RECEIVEACTNO, mp.CHARGE, m.DESC_CN, #{erpFactory} AS ERPFACTORY,
#{erpLocation} AS ERPLOCATION, #{locationName} AS LOCATIONNAME,
mp.materialquantity MATERIALQUANTITY, mp.UNIT
FROM MATERIALPACKING mp
LEFT JOIN MATERIALSPEC m ON m.MATERIALSPECNAME = mp.MATERIALSPECNAME