|
|
@@ -50,7 +50,7 @@ public class ERPServiceImpl implements ERPService {
|
|
|
public Map<String, Object> pushKyeOrder(String master, Integer 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,nvl(pi_receiptcount,1) pi_receiptcount,PI_KYEREMAKR,SYSSENDKYE_"+
|
|
|
+ "pi_recordman,em_mobile,pi_purposename,pi_expresscode,pi_catename_user,pi_address,nvl(pi_receiptcount,1) pi_receiptcount,PI_KYEREMAKR,SYSSENDKYE_,nvl(pi_insuranceValue,0) pi_insuranceValue"+
|
|
|
" from prodinout left join employee on em_name=pi_recordman where pi_id=?",id);
|
|
|
if(rs.next()) {
|
|
|
Map<String,Object> map = new HashMap<>();
|
|
|
@@ -134,6 +134,9 @@ public class ERPServiceImpl implements ERPService {
|
|
|
}else{
|
|
|
orderInfoItem.setReceiptFlag("10");
|
|
|
}
|
|
|
+ //保价值
|
|
|
+ orderInfoItem.setInsuranceValue(rs.getGeneralBigDecimal("pi_insuranceValue"));
|
|
|
+
|
|
|
//回单张数
|
|
|
orderInfoItem.setReceiptCount(rs.getGeneralInt("pi_receiptCount")); //默认值为1
|
|
|
orderInfoItem.setWaybillRemark(rs.getString("pi_kyeremakr"));// 备注:PI_KYEREMAKR
|
|
|
@@ -194,7 +197,7 @@ 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 "+
|
|
|
+ "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);
|
|
|
if(rs.next()) {
|
|
|
logger.info("updateKyeOrder begin: master {} ,id {} ",master,id);
|
|
|
@@ -205,6 +208,8 @@ public class ERPServiceImpl implements ERPService {
|
|
|
orderInfo.setPlatformFlag(kyeConfig.getPlatformFlag());//固定值
|
|
|
orderInfo.setWaybillNumber(rs.getString("pi_logisticscode"));
|
|
|
orderInfo.setType("20"); //为空默认为10,10-修改订单和运单数据 、20-只修改运单数据
|
|
|
+ //保价值
|
|
|
+ orderInfo.setInsuranceValue(rs.getGeneralBigDecimal("pi_insuranceValue"));
|
|
|
//设置寄件方
|
|
|
OrderCustomerInfo preWaybillDelivery = new OrderCustomerInfo();
|
|
|
preWaybillDelivery.setCompanyName("深圳华商龙"); //固定值
|