Yangwl
/
lanju-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wms成品过账修改1

Browse Source
master
mengjiao 9 months ago
parent 126c1ec1f3
commit cc8ccba803
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File

5
op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
Unescape Escape View File

@ -506,6 +506,11 @@ public class SapOrderServiceImpl implements SapOrderService {
L_ITEM.setValue("BATCH", stringObjectMap.get("BATCH")); L_ITEM.setValue("BATCH", stringObjectMap.get("BATCH"));
L_ITEM.setValue("HSDAT", stringObjectMap.get("HSDAT")); L_ITEM.setValue("HSDAT", stringObjectMap.get("HSDAT"));
L_ITEM.setValue("ERFME", stringObjectMap.get("ERFME")); L_ITEM.setValue("ERFME", stringObjectMap.get("ERFME"));
if (stringObjectMap.get("STCK_TYPE").equals("1")){
L_ITEM.setValue("STCK_TYPE", "");
}else {
L_ITEM.setValue("STCK_TYPE", stringObjectMap.get("STCK_TYPE"));
}
} }
func.execute(dest);//执行调用函数 func.execute(dest);//执行调用函数
System.out.println(func.getExportParameterList()); System.out.println(func.getExportParameterList());

7
op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
Unescape Escape View File

@ -791,6 +791,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
String MATDOCUMENTYEAR = (String) map.get("MATDOCUMENTYEAR"); String MATDOCUMENTYEAR = (String) map.get("MATDOCUMENTYEAR");
order.setSapTempInfor(result2.getMsg()); order.setSapTempInfor(result2.getMsg());
WmsRawOrderIn wmsRawOrderIn=new WmsRawOrderIn(); WmsRawOrderIn wmsRawOrderIn=new WmsRawOrderIn();
wmsRawOrderIn.setOrderNo(order.getUserDefined5());
wmsRawOrderIn.setRawOrderInId(IdUtils.fastSimpleUUID()); wmsRawOrderIn.setRawOrderInId(IdUtils.fastSimpleUUID());
wmsRawOrderIn.setFactoryCode(odsProcureOrder.getFactoryCode()); wmsRawOrderIn.setFactoryCode(odsProcureOrder.getFactoryCode());
wmsRawOrderIn.setDnNo(odsProcureOrder.getReceiptNoCode()); wmsRawOrderIn.setDnNo(odsProcureOrder.getReceiptNoCode());
@ -1560,7 +1561,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
orderList) { orderList) {
OdsProcureOutOrder odsProcureOutOrder1 = new OdsProcureOutOrder(); OdsProcureOutOrder odsProcureOutOrder1 = new OdsProcureOutOrder();
odsProcureOutOrder1.setID(IdUtils.fastSimpleUUID()); odsProcureOutOrder1.setID(IdUtils.fastSimpleUUID());
odsProcureOutOrder1.setSiteCode(order1.getFactoryCode()); odsProcureOutOrder1.setSiteCode(odsProcureOutOrder.getFactoryCode());
odsProcureOutOrder1.setProduceCode(odsProcureOutOrder.getUserDefined4());//反冲 odsProcureOutOrder1.setProduceCode(odsProcureOutOrder.getUserDefined4());//反冲
odsProcureOutOrder1.setOutNumber(new BigDecimal("0")); odsProcureOutOrder1.setOutNumber(new BigDecimal("0"));
//odsProcureOutOrder1.setLocCode(order.getWarehouseNo()); //odsProcureOutOrder1.setLocCode(order.getWarehouseNo());
@ -1614,7 +1615,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
orderList) { orderList) {
OdsProcureOutOrder odsProcureOutOrder1 = new OdsProcureOutOrder(); OdsProcureOutOrder odsProcureOutOrder1 = new OdsProcureOutOrder();
odsProcureOutOrder1.setID(IdUtils.fastSimpleUUID()); odsProcureOutOrder1.setID(IdUtils.fastSimpleUUID());
odsProcureOutOrder1.setSiteCode(order1.getFactoryCode()); odsProcureOutOrder1.setSiteCode(odsProcureOutOrder.getFactoryCode());
odsProcureOutOrder1.setProduceCode(order1.getWorkorderCode()); odsProcureOutOrder1.setProduceCode(order1.getWorkorderCode());
odsProcureOutOrder1.setOutNumber(new BigDecimal("0")); odsProcureOutOrder1.setOutNumber(new BigDecimal("0"));
//odsProcureOutOrder1.setLocCode(order.getWarehouseNo()); //odsProcureOutOrder1.setLocCode(order.getWarehouseNo());
@ -1702,7 +1703,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
order.setActive("1"); order.setActive("1");
order.setCreateBy(createBy); order.setCreateBy(createBy);
order.setCreateDate(new Date()); order.setCreateDate(new Date());
order.setSiteCode(factoryCode); //order.setSiteCode(factoryCode);
odsProcureOutOrderMapper.insertWmsRawMissionOut(order); odsProcureOutOrderMapper.insertWmsRawMissionOut(order);
OdsProcureOutOrder odsProcureOutOrder1=new OdsProcureOutOrder(); OdsProcureOutOrder odsProcureOutOrder1=new OdsProcureOutOrder();
odsProcureOutOrder1.setProduceCode(produceCode); odsProcureOutOrder1.setProduceCode(produceCode);

2
op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
Unescape Escape View File

@ -280,6 +280,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
String msgs = "操作完成"; String msgs = "操作完成";
for (WmsProductPut wmsProductPut1 : for (WmsProductPut wmsProductPut1 :
wmsProductPut) { wmsProductPut) {
String status = wmsProductPut1.getStatus();
WmsProductPut wmsProductPutSAPById = wmsProductPutMapper.selectWmsProductPutSAPById(wmsProductPut1.getId()); WmsProductPut wmsProductPutSAPById = wmsProductPutMapper.selectWmsProductPutSAPById(wmsProductPut1.getId());
if (wmsProductPutSAPById != null) { if (wmsProductPutSAPById != null) {
List<WmsProductPut> wmsProductPut2 = wmsProductPutMapper.selectWmsProductPutSAPByIds(wmsProductPutSAPById.getId()); List<WmsProductPut> wmsProductPut2 = wmsProductPutMapper.selectWmsProductPutSAPByIds(wmsProductPutSAPById.getId());
@ -295,6 +296,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
map.put("QUANTITY", wmsProductPut3.getPutQuantity()); map.put("QUANTITY", wmsProductPut3.getPutQuantity());
map.put("ERFME", wmsProductPut3.getUnitOfMeasure()); map.put("ERFME", wmsProductPut3.getUnitOfMeasure());
map.put("BATCH", wmsProductPut3.getAttr4()); map.put("BATCH", wmsProductPut3.getAttr4());
map.put("STCK_TYPE", wmsProductPut1.getAttr3());
//map.put("BATCH", wmsProductPut3.getBatchNumber()); //map.put("BATCH", wmsProductPut3.getBatchNumber());
// if (wmsProductPut3.getBatchNumber().length()>12){ // if (wmsProductPut3.getBatchNumber().length()>12){
// //String batch = mesReportWork.getBatch().substring(12); // //String batch = mesReportWork.getBatch().substring(12);

2
op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
Unescape Escape View File

@ -319,7 +319,7 @@
<if test="lastUpdateDateMIN != null ">AND CONVERT(date, Last_Update_Date, 23) >= #{lastUpdateDateMIN}</if> <if test="lastUpdateDateMIN != null ">AND CONVERT(date, Last_Update_Date, 23) >= #{lastUpdateDateMIN}</if>
<if test="lastUpdateDateMAX != null "> <![CDATA[ AND CONVERT(date, Last_Update_Date, 23) <= #{lastUpdateDateMAX} ]]></if> <if test="lastUpdateDateMAX != null "> <![CDATA[ AND CONVERT(date, Last_Update_Date, 23) <= #{lastUpdateDateMAX} ]]></if>
<if test="materialCode != null and materialCode != ''">and Material_Code = #{materialCode}</if> <if test="materialCode != null and materialCode != ''">and Material_Code = #{materialCode}</if>
<if test="userDefined5 != null and userDefined5 != ''">and Material_Code = #{userDefined5}</if>
</select> </select>
<select id="updateOdsProcureOrderByProcureCode" parameterType="OdsProcureOrder"> <select id="updateOdsProcureOrderByProcureCode" parameterType="OdsProcureOrder">
update ods_procure_order update ods_procure_order

5
op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
Unescape Escape View File

@ -410,7 +410,6 @@
factory_code, factory_code,
active_flag, active_flag,
create_by, create_by,
Site_code,
gmt_create gmt_create
)values ( )values (
#{ID}, #{ID},
@ -427,7 +426,6 @@
#{factoryCode}, #{factoryCode},
#{Active}, #{Active},
#{createBy}, #{createBy},
#{siteCode},
#{createDate} ) #{createDate} )
</insert> </insert>
@ -1153,7 +1151,8 @@
wms_ods_procure_out_order wms_ods_procure_out_order
<where> <where>
<if test="produceCode != null and produceCode != ''"> and Produce_Code like concat('%', #{produceCode}, '%')</if> <if test="produceCode != null and produceCode != ''"> and Produce_Code like concat('%', #{produceCode}, '%')</if>
<if test="userDefined1 != null and userDefined1 != ''"> and User_Defined1 = #{userDefined1}</if> <if test="materialCode != null and materialCode != ''"> and Material_Code like concat('%', #{materialCode}, '%')</if>
<if test="userDefined4 != null and userDefined4 != ''"> and User_Defined4 like concat('%', #{userDefined4}, '%') </if>
<if test="Active != null and Active != ''"> and Active = #{Active}</if> <if test="Active != null and Active != ''"> and Active = #{Active}</if>
</where> </where>
ORDER BY Create_Date DESC ORDER BY Create_Date DESC

Write Preview
Loading…
Cancel
Save