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

Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr

Browse Source
This commit is contained in:
郭飞 2025-05-13 10:59:09 +08:00
commit ff6484dcae
4 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zi-wms-environment/launch/CNMsvr.run.xml
View File

@ -1,10 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="CNMsvr" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="zi-wms-boot" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.zi.mwms.solution.Application" />
<option name="VM_PARAMETERS" value="-DWMS_HOME=$ProjectFileDir$/zi-wms-environment/ -DconfigRootPath=$ProjectFileDir$/zi-wms-environment/config -DLOGDIR=$ProjectFileDir$/../logs -Dcompany=BOE -Dfactory=B16 -Dcim=MWMS -Dmode=DEV10539622 -Dsvr=CNMsvr -DSeq=CNMsvr1 -Dclient=OIC -Dmode=DEV -Dservice=8400 -Dnetwork=;225.11.11.4 -Ddaemon= -DworkerWeight=2 -DworkerTasks=1 -DschedulerWeight=10 -Ddq=${USERNAME} -DdataField=Message -Ddbtype=DEV -Didmframe.flow.bpelj=http://bpel.boe.com/bpelj/ -Dspring.jdbc.getParameterType.ignore=true -Dhttp.port=18873 -Duseamqp=false -Dscheduler=false -DuseTibrv=false -Dtypemode=Local" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>

10
zi-wms-generic/src/main/java/com/cim/idm/wmsextend/generic/master/ConstantMap.java
View File

@ -335,6 +335,16 @@ public class ConstantMap extends com.cim.idm.wmspackage.generic.master.ConstantM
public String BMDT_ManualStockIn_KOSTL = "2000PA0500"; public String BMDT_ManualStockIn_KOSTL = "2000PA0500";
public CharSequence Factory_All = "ALL"; public CharSequence Factory_All = "ALL";
/**
* MATERIALPACKING_STOCKSTATE
*/
public String STOCKSTATE_CREATED = "Created";
public String STOCKSTATE_STOCKED = "Stocked";
public String STOCKSTATE_STOCKOUT = "StockOut";
public String STOCKSTATE_RELEASED = "Released";
private Map<String, String> constantDefsMap = new HashMap<String, String>(); private Map<String, String> constantDefsMap = new HashMap<String, String>();
private ApplicationContext ac; private ApplicationContext ac;

2
zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java
View File

@ -1182,6 +1182,6 @@ public class SaleOutController {
if (sendERPStockOut == null || "".equals(sendERPStockOut)) { if (sendERPStockOut == null || "".equals(sendERPStockOut)) {
return AjaxResult.me().setSuccess(false).setMessage("过账失败"); return AjaxResult.me().setSuccess(false).setMessage("过账失败");
} }
return AjaxResult.me().setResultObj(null); return AjaxResult.me().setSuccess(true).setErrorCode(200);
} }
} }

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

@ -3051,16 +3051,26 @@ public class InvoiceServiceImpl implements InvoiceService {
String ERPRECEIVEFACTORY = receiveList.get(0).get("ERPRECEIVEFACTORY") == null ? "" : receiveList.get(0).get("ERPRECEIVEFACTORY").toString(); String ERPRECEIVEFACTORY = receiveList.get(0).get("ERPRECEIVEFACTORY") == null ? "" : receiveList.get(0).get("ERPRECEIVEFACTORY").toString();
//判断是否为MES需要二次接收的物料 //判断是否为MES需要二次接收的物料
String sqlc=" SELECT e.ENUMVALUE FROM MES_ENUMDEFVALUE e \r\n" + /*String sqlc=" SELECT e.ENUMVALUE FROM MES_ENUMDEFVALUE e \r\n" +
" WHERE e.ENUMNAME ='ConfirmReceiveArea'\r\n" + " WHERE e.ENUMNAME ='ConfirmReceiveArea'\r\n" +
" AND e.ENUMVALUE in(\r\n" + " AND e.ENUMVALUE in(\r\n" +
" SELECT p.AREANAME FROM MES_PRODUCTREQUEST p \r\n" + " SELECT p.AREANAME FROM MES_PRODUCTREQUEST p \r\n" +
" WHERE p.PRODUCTREQUESTNAME =(SELECT m.RECEIVEPRODUCTIONORDERNUMBER FROM MATERIALSHIPREQUESTDETAIL m \r\n" + " WHERE p.PRODUCTREQUESTNAME =(SELECT m.RECEIVEPRODUCTIONORDERNUMBER FROM MATERIALSHIPREQUESTDETAIL m \r\n" +
" WHERE m.SHIPREQUESTNAME=:SHIPREQUESTNAME AND RECEIVEPRODUCTIONORDERNUMBER IS NOT NULL AND ROWNUM=1))"; " WHERE m.SHIPREQUESTNAME=:SHIPREQUESTNAME AND RECEIVEPRODUCTIONORDERNUMBER IS NOT NULL AND ROWNUM=1))";*/
List<Map<String,Object>> src = new ArrayList<Map<String,Object>>();
List<Map<String,Object>> src=IDMFrameServiceProxy.getSqlTemplate().queryForList(sqlc, bpc); String sqlQuery = " SELECT m.RECEIVEPRODUCTIONORDERNUMBER FROM MATERIALSHIPREQUESTDETAIL m " +
" WHERE m.SHIPREQUESTNAME=:SHIPREQUESTNAME AND RECEIVEPRODUCTIONORDERNUMBER IS NOT NULL AND ROWNUM=1";
List<Map<String,Object>> materialShipRequestDetailList = IDMFrameServiceProxy.getSqlTemplate().queryForList(sqlQuery, bpc);
if (null != materialShipRequestDetailList && !materialShipRequestDetailList.isEmpty()){
String productRequestName = materialShipRequestDetailList.get(0).get("RECEIVEPRODUCTIONORDERNUMBER") == null ? "" : materialShipRequestDetailList.get(0).get("RECEIVEPRODUCTIONORDERNUMBER").toString().substring(4);
String sqlc = " SELECT e.ENUMVALUE FROM ENUMDEFVALUE@MES_PRODUCTREQUEST e \r\n" +
" WHERE e.ENUMNAME ='ConfirmReceiveArea'\r\n" +
" AND e.ENUMVALUE in(\r\n" +
" SELECT p.AREANAME FROM PRODUCTREQUEST@MES_PRODUCTREQUEST p \r\n" +
" WHERE p.PRODUCTREQUESTNAME =:PRODUCTREQUESTNAME)";
bpc.put("PRODUCTREQUESTNAME", productRequestName);
src = IDMFrameServiceProxy.getSqlTemplate().queryForList(sqlc, bpc);
}
//MES需要接收，则只抛送数据。 或如果是现场仓,先移到现场仓 //MES需要接收，则只抛送数据。 或如果是现场仓,先移到现场仓
if(src.size()>0) { if(src.size()>0) {
billCode="Y"; billCode="Y";