|
|
@@ -62,6 +62,7 @@ public class MESServiceImpl implements MESService {
|
|
|
Object vaid=0;
|
|
|
String caller="VerifyApply!ToOtherIn";
|
|
|
String type="其它入库单";
|
|
|
+ String djcaller="ProdInOut!OtherIn";
|
|
|
String sellerName="";
|
|
|
String whcode="";
|
|
|
for (int i = 0; i <jsonArray.size() ; i++) {
|
|
|
@@ -81,6 +82,7 @@ public class MESServiceImpl implements MESService {
|
|
|
if (count1>0){
|
|
|
caller="VerifyApply!ToPurcIn";
|
|
|
type="采购验收单";
|
|
|
+ djcaller="ProdInOut!PurcCheckin";
|
|
|
}
|
|
|
//判断已转数
|
|
|
Object chekQty = baseDao.getJdbcTemplate().queryForObject("select wmsys.wm_concat('收料单:'||vad_code||'序号:'||vad_detno) from VerifyApplyDetail where vad_qty <= vad_yqty and vad_vaid = "+vaid, String.class);
|
|
|
@@ -171,7 +173,7 @@ public class MESServiceImpl implements MESService {
|
|
|
// 修改收料状态
|
|
|
baseDao.updateByCondition("VerifyApplyDetail", "vad_yqty=vad_qty", "vad_vaid=" + vaid);
|
|
|
baseDao.updateByCondition("VerifyApply", "va_turnstatuscode='TURNIN',va_turnstatus='已入库'", "va_id=" + vaid);
|
|
|
- String s = postProdInOut(piid, caller, employee);
|
|
|
+ String s = postProdInOut(piid, djcaller, employee);
|
|
|
System.err.println(s);
|
|
|
if (s!=null){
|
|
|
return ApiResponse.successRsp("0",request.getHeader("RequestId"),type+":"+key.getCode()+",过账失败,请在ERP重新过账!");
|