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

Compare commits

base: 10539622:c6b639c10fac17bd37cba1f1240594ef37122bc9
Branches Tags
10539622:main
..
compare: 10539622:3810db4375501326ff243cb13802dec2c048255c
Branches Tags
10539622:main

No commits in common. "c6b639c10fac17bd37cba1f1240594ef37122bc9" and "3810db4375501326ff243cb13802dec2c048255c" have entirely different histories.
c6b639c10f ... 3810db4375

6 changed files with 38 additions and 143 deletions
Show Stats Expand all files Collapse all files

8
zi-wms-environment/config/db/oracle.properties
View File

@ -6,18 +6,18 @@
#db.Local.url=jdbc:oracle:thin:@10.140.249.73:1521:ORCL #db.Local.url=jdbc:oracle:thin:@10.140.249.73:1521:ORCL
#db.Local.username=b16mwmsadm #db.Local.username=b16mwmsadm
#db.Local.password=adm2024 #db.Local.password=adm2024
db.Local.url=jdbc:oracle:thin:@192.168.1.73:1526/test db.Local.url=jdbc:oracle:thin:@123.57.206.181:1521/ORCLPDB1
db.Local.username=ziwms_sap_test db.Local.username=ziwms_sap_test
db.Local.password=adm2024 db.Local.password=adm2024
#Section 2 - Customer Local dev DB Info #Section 2 - Customer Local dev DB Info
db.Dev.url=jdbc:oracle:thin:@192.168.1.73:1526/test db.Dev.url=jdbc:oracle:thin:@123.57.206.181:1521/ORCLPDB1
db.Dev.username=ziwms_sap_test db.Dev.username=ziwms_sap_test
db.Dev.password=adm2024 db.Dev.password=adm2024
#Section 3 - Customer Test DB Info #Section 3 - Customer Test DB Info
db.Tst.url=jdbc:oracle:thin:@192.168.1.73:1526/test db.Tst.url=jdbc:oracle:thin:@123.57.206.181:1521/ORCLPDB1
db.Tst.username=ziwms_sap_test db.Tst.username=ziwms_sap_test
db.Tst.password=adm2024 db.Tst.password=adm2024
#Section 4 - Customer Prod DB Info #Section 4 - Customer Prod DB Info
db.Prd.url=jdbc:oracle:thin:@192.168.1.73:1526/test db.Prd.url=jdbc:oracle:thin:@123.57.206.181:1521/ORCLPDB1
db.Prd.username=ziwms_sap_test db.Prd.username=ziwms_sap_test
db.Prd.password=adm2024 db.Prd.password=adm2024

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

@ -731,7 +731,7 @@ public class ToSAPServiceImpl {
Map<String,String> bodyJSonData = new HashMap<>(); Map<String,String> bodyJSonData = new HashMap<>();
MainData.put("HEAD",headJSonData); MainData.put("HEAD",headJSonData);
MainData.put("BODY",bodyJSonData); MainData.put("BODY",bodyJSonData);
headJSonData.put("INTF_ID","MM068"); headJSonData.put("INTF_ID","");
headJSonData.put("SRC_SYSTEM","WMS"); headJSonData.put("SRC_SYSTEM","WMS");
headJSonData.put("DEST_SYSTEM","SAP"); headJSonData.put("DEST_SYSTEM","SAP");
headJSonData.put("SRC_MSGID",""); headJSonData.put("SRC_MSGID","");

43
zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialUndoController.java
View File

@ -29,7 +29,7 @@ public class MaterialUndoController {
private MaterialUndoServiceImpl materialUndoServiceImpl; private MaterialUndoServiceImpl materialUndoServiceImpl;
@RequestMapping(value = "/commitUndo", method = RequestMethod.POST) @RequestMapping(value = "/commitUndo", method = RequestMethod.POST)
public AjaxResult commitUndo(@RequestBody JSONObject in ) throws Exception { public AjaxResult commitUndo(@RequestBody JSONObject in ) {
MaterialUndoDto undoDto = JSON.toJavaObject(in, MaterialUndoDto.class); MaterialUndoDto undoDto = JSON.toJavaObject(in, MaterialUndoDto.class);
String undoId = undoDto.getUndoId(); String undoId = undoDto.getUndoId();
@ -44,38 +44,25 @@ public class MaterialUndoController {
return AjaxResult.me().setSuccess(false).setMessage(e.toString()); return AjaxResult.me().setSuccess(false).setMessage(e.toString());
} }
//校验单据类型，根据单据类型判断逻辑 //校验单据类型，根据单据类型判断逻辑
// switch (inv_TYPE) { switch (inv_TYPE) {
// case "45": case "45":
// materialUndoServiceImpl.rkUndo(undoId, userId); materialUndoServiceImpl.rkUndo(undoId, userId);
// break; break;
// case "46": case "46":
// materialUndoServiceImpl.cprkUndo(undoId, userId); materialUndoServiceImpl.cprkUndo(undoId, userId);
// break; break;
// case "4C": case "4C":
// materialUndoServiceImpl.ckUndo(undoId, userId);
// case "4Y" :
// materialUndoServiceImpl.ckUndo(undoId, userId);
// case "4I" :
// materialUndoServiceImpl.ckUndo(undoId, userId);
// break;
// default :
// return AjaxResult.me().setSuccess(false).setMessage("单据类型不支持冲销");
// }
if ("Z001".equals(inv_TYPE) || "Z005".equals(inv_TYPE) || "Z006".equals(inv_TYPE) || "Z007".equals(inv_TYPE) || "Z008".equals(inv_TYPE)) {
materialUndoServiceImpl.rkUndo(undoId, userId); // 入库
} else if ("Z002".equals(inv_TYPE) || "Z003".equals(inv_TYPE) || "Z004".equals(inv_TYPE)) {
materialUndoServiceImpl.cprkUndo(undoId, userId);// 成品入库
} else if (inv_TYPE.contains("ZLF")) {
materialUndoServiceImpl.ckUndo(undoId, userId); materialUndoServiceImpl.ckUndo(undoId, userId);
} else if (inv_TYPE.contains("ZLR")) { case "4Y" :
materialUndoServiceImpl.ckUndo(undoId, userId); materialUndoServiceImpl.ckUndo(undoId, userId);
}else if(inv_TYPE.contains("ZK")) { // 转库 case "4I" :
materialUndoServiceImpl.zkUndo(undoId, userId); materialUndoServiceImpl.ckUndo(undoId, userId);
}else { break;
default :
return AjaxResult.me().setSuccess(false).setMessage("单据类型不支持冲销"); return AjaxResult.me().setSuccess(false).setMessage("单据类型不支持冲销");
} }
return AjaxResult.me().setSuccess(true).setMessage("冲销成功"); return AjaxResult.me().setSuccess(true).setMessage("冲销成功");
} }
} }

19
zi-wms-pda/src/main/java/com/cim/idm/dao/MaterialReversalDao.java
View File

@ -1,19 +0,0 @@
package com.cim.idm.dao;
import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPacking;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
@Mapper
public interface MaterialReversalDao {
//更新冲销凭证为已冲销
public static void updateReversalUnDoId(@Param("undoId") String undoId) throws Exception {
}
}

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

@ -1,12 +1,9 @@
package com.cim.idm.service.Impl; package com.cim.idm.service.Impl;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.cim.idm.dao.MaterialReversalDao;
import com.cim.idm.exception.GlobalException;
import com.cim.idm.framework.IDMFrameServiceProxy; import com.cim.idm.framework.IDMFrameServiceProxy;
import com.cim.idm.framework.data.EventInfo; import com.cim.idm.framework.data.EventInfo;
import com.cim.idm.service.IMaterialUndoService; import com.cim.idm.service.IMaterialUndoService;
import com.cim.idm.service.impl.ToSAPServiceImpl;
import com.cim.idm.utils.AjaxResult; import com.cim.idm.utils.AjaxResult;
import com.cim.idm.utils.EventInfoUtil; import com.cim.idm.utils.EventInfoUtil;
import com.cim.idm.wmspackage.materialpacking.MaterialPackingServiceProxy; import com.cim.idm.wmspackage.materialpacking.MaterialPackingServiceProxy;
@ -14,7 +11,6 @@ import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPacking;
import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPackingKey; import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPackingKey;
import com.cim.idm.wmspackage.materialpacking.management.info.RemoveInfo; import com.cim.idm.wmspackage.materialpacking.management.info.RemoveInfo;
import com.cim.idm.wmspackage.materialpacking.management.info.SetEventInfo; import com.cim.idm.wmspackage.materialpacking.management.info.SetEventInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -25,24 +21,14 @@ import java.util.Map;
@Service("MaterialUndo") @Service("MaterialUndo")
public class MaterialUndoServiceImpl implements IMaterialUndoService { public class MaterialUndoServiceImpl implements IMaterialUndoService {
@Autowired
private ToSAPServiceImpl toSAPService;
@Autowired
private MaterialReversalDao materialReversalDao;
/** /**
* 入库冲销 * 入库冲销
* @param undoId * @param undoId
* @param user * @param user
*/ */
@Transactional @Transactional
public void rkUndo (String undoId, String user) throws Exception { public void rkUndo (String undoId, String user) {
String billCode = toSAPService.cancelShipInter(undoId, user);
if (billCode == null) {
throw new GlobalException("报送ERP失败,请联系IT处理！");
}
EventInfo makeEventInfo = new EventInfoUtil().makeEventInfo("MakeUndo", user, "MakeUndo"); EventInfo makeEventInfo = new EventInfoUtil().makeEventInfo("MakeUndo", user, "MakeUndo");
String condition="WHERE UNDOID =? "; String condition="WHERE UNDOID =? ";
String[] bindSet={undoId}; String[] bindSet={undoId};
@ -56,13 +42,11 @@ public class MaterialUndoServiceImpl implements IMaterialUndoService {
MaterialPackingKey key = materialPacking.getKey(); MaterialPackingKey key = materialPacking.getKey();
MaterialPackingServiceProxy.getMaterialPackingService().setEvent(key, makeEventInfo, setEventInfo); MaterialPackingServiceProxy.getMaterialPackingService().setEvent(key, makeEventInfo, setEventInfo);
} }
// String sql = "UPDATE BS_MATERIALPACKINGUNDOINFO b SET b.FLAG = 'Y' WHERE b.UNDOID = :UNDOID"; String sql = "UPDATE IF_ERPUNDO T SET T.FLAG = 'Y' WHERE T.UNDOID = :UNDOID ";
// Map<String, Object> hashMap2 = new HashMap<String, Object> (); Map<String, Object> hashMap2 = new HashMap<String, Object> ();
// hashMap2.put("UNDOID", undoId); hashMap2.put("UNDOID", undoId);
// IDMFrameServiceProxy.getSqlTemplate().update(sql, hashMap2); IDMFrameServiceProxy.getSqlTemplate().update(sql, hashMap2);
// 更新凭证冲销状态
MaterialReversalDao.updateReversalUnDoId(undoId);
} }
/** /**
@ -71,11 +55,7 @@ public class MaterialUndoServiceImpl implements IMaterialUndoService {
* @param user * @param user
*/ */
@Transactional @Transactional
public void cprkUndo (String undoId, String user) throws Exception { public void cprkUndo (String undoId, String user) {
String billCode = toSAPService.cancelShipInter(undoId, user);
if (billCode == null) {
throw new GlobalException("报送ERP失败,请联系IT处理！");
}
EventInfo makeEventInfo = new EventInfoUtil ().makeEventInfo("MakeUndo", user, "MakeUndo"); EventInfo makeEventInfo = new EventInfoUtil ().makeEventInfo("MakeUndo", user, "MakeUndo");
String condition="SELECT MATERIALPACKINGNAME FROM MATERIALPACKING WHERE UNDOID = :UNDOID "; String condition="SELECT MATERIALPACKINGNAME FROM MATERIALPACKING WHERE UNDOID = :UNDOID ";
// String[] bindSet={undoId}; // String[] bindSet={undoId};
@ -135,12 +115,10 @@ public class MaterialUndoServiceImpl implements IMaterialUndoService {
MaterialPackingServiceProxy.getMaterialPackingService().remove(new MaterialPackingKey("SDK", MATERIALPACKINGNAME), makeEventInfo, removeInfo); MaterialPackingServiceProxy.getMaterialPackingService().remove(new MaterialPackingKey("SDK", MATERIALPACKINGNAME), makeEventInfo, removeInfo);
} }
// String sql = "UPDATE IF_ERPUNDO T SET T.FLAG = 'Y' WHERE T.UNDOID = :UNDOID "; String sql = "UPDATE IF_ERPUNDO T SET T.FLAG = 'Y' WHERE T.UNDOID = :UNDOID ";
// Map<String, Object> hashMap2 = new HashMap<String, Object> (); Map<String, Object> hashMap2 = new HashMap<String, Object> ();
// hashMap2.put("UNDOID", undoId); hashMap2.put("UNDOID", undoId);
// IDMFrameServiceProxy.getSqlTemplate().update(sql, hashMap2); IDMFrameServiceProxy.getSqlTemplate().update(sql, hashMap2);
// 更新凭证冲销状态
MaterialReversalDao.updateReversalUnDoId(undoId);
} }
@ -150,13 +128,7 @@ public class MaterialUndoServiceImpl implements IMaterialUndoService {
* @param user * @param user
*/ */
@Transactional @Transactional
public void ckUndo (String undoId, String user) throws Exception { public void ckUndo (String undoId, String user) {
String billCode = toSAPService.cancelShipInter(undoId, user);
if (billCode == null) {
throw new GlobalException("报送ERP失败,请联系IT处理！");
}
EventInfo makeEventInfo = new EventInfoUtil ().makeEventInfo("MakeUndo", user, "MakeUndo"); EventInfo makeEventInfo = new EventInfoUtil ().makeEventInfo("MakeUndo", user, "MakeUndo");
String condition="WHERE UNDOID =? "; String condition="WHERE UNDOID =? ";
String[] bindSet={undoId}; String[] bindSet={undoId};
@ -222,44 +194,11 @@ public class MaterialUndoServiceImpl implements IMaterialUndoService {
IDMFrameServiceProxy.getSqlTemplate().update(pcSql, hashMap); IDMFrameServiceProxy.getSqlTemplate().update(pcSql, hashMap);
IDMFrameServiceProxy.getSqlTemplate().update(cxSql, hashMap); IDMFrameServiceProxy.getSqlTemplate().update(cxSql, hashMap);
} }
// 更新凭证冲销状态 String sql = "UPDATE IF_ERPUNDO T SET T.FLAG = 'Y' WHERE T.UNDOID = :UNDOID ";
MaterialReversalDao.updateReversalUnDoId(undoId); Map<String, Object> hashMap2 = new HashMap<String, Object> ();
} hashMap2.put("UNDOID", undoId);
IDMFrameServiceProxy.getSqlTemplate().update(sql, hashMap2);
/**
* 转库
* @param undoId
* @param user
*/
@Transactional
public void zkUndo (String undoId, String user) throws Exception {
String billCode = toSAPService.cancelShipInter(undoId, user);
if (billCode == null) {
throw new GlobalException("报送ERP失败,请联系IT处理！");
}
EventInfo makeEventInfo = new EventInfoUtil().makeEventInfo("MakeUndo", user, "MakeUndo");
String condition="WHERE UNDOID =? ";
String[] bindSet={undoId};
//根据物料凭证找到所有的待冲销数据，更新库存状态为创建
List<MaterialPacking> list = MaterialPackingServiceProxy.getMaterialPackingService().select(condition, bindSet);
for (MaterialPacking materialPacking : list) {
Map<String, Object> hashMap = new HashMap<String, Object> ();
hashMap.put("erpLocation", materialPacking.getPreErpLocation());
hashMap.put("locationName", materialPacking.getPreLocationName());
hashMap.put("preErpLocation", materialPacking.getErpLocation());
hashMap.put("preLocationName", materialPacking.getLocationName());
SetEventInfo setEventInfo = new SetEventInfo();
setEventInfo.setUserColumns(hashMap);
MaterialPackingKey key = materialPacking.getKey();
MaterialPackingServiceProxy.getMaterialPackingService().setEvent(key, makeEventInfo, setEventInfo);
}
// 更新凭证冲销状态
MaterialReversalDao.updateReversalUnDoId(undoId);
} }
} }

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

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cim.idm.dao.MaterialReversalDao">
<!-- 更新入库标记-->
<update id="updateReversalUnDoId" parameterType="map">
UPDATE BS_MATERIALPACKINGUNDOINFO b SET b.FLAG = 'Y' WHERE b.UNDOID = #{undoId}
</update>
</mapper>