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-03-20 13:54:33 +08:00
commit e770868de1
4 changed files with 65 additions and 6 deletions
Show Stats Download Patch File Download Diff File 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.username=b16mwmsadm
#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.password=adm2024
#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.password=adm2024
#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.password=adm2024
#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.password=adm2024

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

@ -2500,7 +2500,7 @@ public class ToSAPServiceImpl {
.append(" WHERE ").append(SystemPropHelper.CR)
.append(" mp.SHIPREQUESTNAME = :SHIPREQUESTNAME ").append(SystemPropHelper.CR)
.append(" AND mp.SITENAME = :SITENAME ").append(SystemPropHelper.CR)
.append(" AND mp.STOCKSTATE = 'Stocked' AND T.MATERIALPACKINGNAME IN :BATCH ").append(SystemPropHelper.CR)
.append(" AND mp.STOCKSTATE = 'Stocked' AND mp.MATERIALPACKINGNAME IN :BATCH ").append(SystemPropHelper.CR)
.append(" GROUP BY ").append(SystemPropHelper.CR)
.append(" mp.SHIPREQUESTDETAILNAME , ").append(SystemPropHelper.CR)
.append(" mp.ERPLOCATION, ").append(SystemPropHelper.CR)

59
zi-wms-pda/src/main/java/com/cim/idm/controller/CacheWareController.java Normal file
View File

@ -0,0 +1,59 @@
package com.cim.idm.controller;
import com.cim.idm.framework.IDMFrameServiceProxy;
import com.cim.idm.framework.data.EventInfo;
import com.cim.idm.response.BaseResponse;
import com.cim.idm.response.RespGenerator;
import com.cim.idm.utils.EventInfoUtil;
import io.swagger.annotations.Api;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.sql.Timestamp;
import java.text.ParseException;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.Map;
@Api("无订单无批次缓存仓")
@RestController
@RequestMapping("/stockIn")
@EnableAutoConfiguration
public class CacheWareController {
@RequestMapping(value = "/checkNChargeNOrder", method = RequestMethod.POST)
public BaseResponse<Map<String, Object>> checkNChargeNOrder(@RequestBody Map<String,Object> params) throws ParseException {
String sitename = (String)params.get("SITENAME");
String userid = (String)params.get("USERID");
String materialspecname = (String)params.get("MATERIALSPECNAME");
String makedatet = (String) params.get("MAKEDATE");
// @TODO 原代码异常：Timestamp makedate = Timestamp.valueOf(makedatet);
Timestamp makedate = Timestamp.from(
LocalDateTime.parse(makedatet, DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ"))
.atZone(ZoneOffset.UTC).toInstant());
String is_sure = (String)params.get("IS_SURE");
Map<String, Object> bindMap = new HashMap<String, Object>();
bindMap.put("SITENAME", sitename);
bindMap.put("MATERIALSPECNAME", materialspecname);
bindMap.put("MAKEDATE", makedate);
bindMap.put("IS_SURE", is_sure);
String sql = "UPDATE MATERIALCACHE E SET E.IS_SURE = :IS_SURE WHERE E.MATERIALSPECNAME = :MATERIALSPECNAME AND SITENAME = :SITENAME AND MAKEDATE = :MAKEDATE";
IDMFrameServiceProxy.getSqlTemplate().update(sql, bindMap);
EventInfo eventInfo = new EventInfoUtil().makeEventInfo("checkNChargeNOrder", userid, "checkNChargeNOrder");
BaseResponse returnOK = RespGenerator.returnOK(params);
return returnOK;
}
}

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

@ -70,7 +70,7 @@ public class MoveTransformServiceImpl {
} else if (parseFloat - materialQuantity2 == 0) {
hashMap.put("stockState", "StockOut");
} else {
hashMap.put("MaterialQuantity", materialQuantity2 - parseFloat );
hashMap.put("materialQuantity", materialQuantity2 - parseFloat );
}
setEventInfo.setUserColumns(hashMap);
MaterialPackingServiceProxy.getMaterialPackingService().setEvent(materialPacking.getKey(), makeEventInfo, setEventInfo);