|
|
@@ -160,8 +160,8 @@ public class ERPServiceImpl implements ERPService {
|
|
|
OrderResult orderResult = JsonUtils.serializable(JSON.toJSONString(res.get("data")),new TypeReference<OrderResult>(){});
|
|
|
if(orderResult.getTotal().getSuccessTotal()>0) {
|
|
|
SuccessOrderResult result = orderResult.getSuccess().get(0);
|
|
|
- //更新单号,时间 、物料信息 SYSSENDKYE_ 、SYSSENDKYEDATE_ 、 pi_logisticscode
|
|
|
- baseDao.execute("update prodinout set SYSSENDKYE_=-1,SYSSENDKYEDATE_=sysdate, pi_logisticscode=? where pi_id=" + id, result.getWaybillNumber());
|
|
|
+ //更新单号,时间 、物料信息 SYSSENDKYE_ 、SYSSENDKYEDATE_ 、 pi_listcode
|
|
|
+ baseDao.execute("update prodinout set SYSSENDKYE_=-1,SYSSENDKYEDATE_=sysdate, pi_listcode=? where pi_id=" + id, result.getWaybillNumber());
|
|
|
commonService.logKyeSRecord(rs.getString("pi_inoutno"), id, result.getWaybillNumber(),"下单成功");
|
|
|
suc = true;
|
|
|
}else if(orderResult.getTotal().getUnconfirmTotal()>0){
|
|
|
@@ -197,8 +197,8 @@ public class ERPServiceImpl implements ERPService {
|
|
|
public Map<String, Object> updateKyeOrder(String master, int id) throws IOException {
|
|
|
SpObserver.putSp(master);
|
|
|
SqlRowList rs = baseDao.queryForRowSet("select pi_inoutno,pi_title,PI_SERVICEMODE,PI_PAYMODE,PI_PAYMENTCUSTOMER,nvl(PI_IFRECEIPTFLAG,0) PI_IFRECEIPTFLAG," +
|
|
|
- "pi_recordman,em_mobile,pi_purposename,pi_expresscode,pi_catename_user,pi_address,SYSSENDKYE_,pi_logisticscode,nvl(pi_insuranceValue,0) pi_insuranceValue "+
|
|
|
- " from prodinout left join employee on em_name=pi_recordman where pi_id=? and nvl(SYSSENDKYE_,0)<>0 and nvl(pi_logisticscode,' ')<>' ' ",id);
|
|
|
+ "pi_recordman,em_mobile,pi_purposename,pi_expresscode,pi_catename_user,pi_address,SYSSENDKYE_,pi_listcode,nvl(pi_insuranceValue,0) pi_insuranceValue "+
|
|
|
+ " from prodinout left join employee on em_name=pi_recordman where pi_id=? and nvl(SYSSENDKYE_,0)<>0 and nvl(pi_listcode,' ')<>' ' ",id);
|
|
|
if(rs.next()) {
|
|
|
logger.info("updateKyeOrder begin: master {} ,id {} ",master,id);
|
|
|
Map<String,Object> map = new HashMap<>();
|
|
|
@@ -206,7 +206,7 @@ public class ERPServiceImpl implements ERPService {
|
|
|
OrderUpdateInfoDTO orderInfo = new OrderUpdateInfoDTO();
|
|
|
orderInfo.setCustomerCode(kyeConfig.getCustomerCode());//固定值
|
|
|
orderInfo.setPlatformFlag(kyeConfig.getPlatformFlag());//固定值
|
|
|
- orderInfo.setWaybillNumber(rs.getString("pi_logisticscode"));
|
|
|
+ orderInfo.setWaybillNumber(rs.getString("pi_listcode"));
|
|
|
orderInfo.setType("20"); //为空默认为10,10-修改订单和运单数据 、20-只修改运单数据
|
|
|
//保价值
|
|
|
orderInfo.setInsuranceValue(rs.getGeneralBigDecimal("pi_insuranceValue"));
|
|
|
@@ -237,11 +237,11 @@ public class ERPServiceImpl implements ERPService {
|
|
|
String response = callWebserviceKYE("open.api.openCommon.updateYdByCondition", JSONArray.toJSONString(orderInfo));
|
|
|
Map<Object, Object> res = BaseUtil.parseFormStoreToMap(response);
|
|
|
if(Boolean.valueOf(res.get("success").toString())){
|
|
|
- //更新单号,时间 、物料信息 SYSSENDKYE_ 、SYSSENDKYEDATE_ 、 pi_logisticscode
|
|
|
+ //更新单号,时间 、物料信息 SYSSENDKYE_ 、SYSSENDKYEDATE_ 、 pi_listcode
|
|
|
baseDao.execute("update prodinout set SYSSENDKYE_=-1,SYSSENDKYEDATE_=sysdate where pi_id=" + id);
|
|
|
- commonService.logKyeSRecord(rs.getString("pi_inoutno"), id, rs.getString("pi_logisticscode"),res.get("msg").toString());
|
|
|
+ commonService.logKyeSRecord(rs.getString("pi_inoutno"), id, rs.getString("pi_listcode"),res.get("msg").toString());
|
|
|
}else{
|
|
|
- commonService.logKyeFRecord(rs.getString("pi_inoutno"),id,res.get("msg").toString(),rs.getString("pi_logisticscode"));
|
|
|
+ commonService.logKyeFRecord(rs.getString("pi_inoutno"),id,res.get("msg").toString(),rs.getString("pi_listcode"));
|
|
|
map.put("message", res.get("msg").toString());
|
|
|
}
|
|
|
logger.info("updateKyeOrder end: master {} ,id {} ",master,id);
|