diff --git a/erp-hyc-interfaces-api/pom.xml b/erp-hyc-interfaces-api/pom.xml index 68b1279e9d5f4c488aa1d04d0007378724107c48..bb69ad1f97d694efd76d9c615db76fbfb4d438c2 100644 --- a/erp-hyc-interfaces-api/pom.xml +++ b/erp-hyc-interfaces-api/pom.xml @@ -3,7 +3,7 @@ com.unlcn.erp.hyc.interfaces erp-hyc-interfaces - 1.2.0 + 1.3.2 4.0.0 diff --git a/erp-hyc-interfaces-backend/pom.xml b/erp-hyc-interfaces-backend/pom.xml index f476639064035cd24b2b9580957b800221bf2407..7dd7371c5a8669eb23152cd0aa57c4d06a2a4608 100644 --- a/erp-hyc-interfaces-backend/pom.xml +++ b/erp-hyc-interfaces-backend/pom.xml @@ -4,7 +4,7 @@ com.unlcn.erp.hyc.interfaces erp-hyc-interfaces - 1.2.0 + 1.3.2 4.0.0 @@ -90,6 +90,12 @@ joda-time 2.9.9 + + com.google.guava + guava + 21.0 + compile + org.apache.commons commons-lang3 diff --git a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java index 22f1aecd1f448b55f8ee63534f47a0f2b5f56bb1..5d272fd39ff43d17c561cc982d76a574603ad81b 100644 --- a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java +++ b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallOrderByHYCServiceImpl.java @@ -192,6 +192,7 @@ public class CallOrderByHYCServiceImpl implements CallOrderByHYCService{ soorder.setVcuserno("system"); }else { soorder.setVcuserno(db.getUsername()); + soorder.setVcreceiveduty(db.getUsername()); } soorder.setDtdate(db.getCreatetime()); soorder.setVcaddress(db.getDepartaddr()); @@ -275,6 +276,8 @@ public class CallOrderByHYCServiceImpl implements CallOrderByHYCService{ LOGGER.error("该订单好现金标记为NULL："+db.getOrdercode()); } soorder.setDcpay(db.getCost()); + + /** 如果在慧运车中做收款，则打开 if(db.getPaystatus() == 30){ //10, "未支付",20, "待支付",30, "已支付" soorder.setDcpayed(db.getCost()); diff --git a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallWayBillByHYCServiceImpl.java b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallWayBillByHYCServiceImpl.java index 3220f367fea560800eb9bcee20f8e9e461b8df2e..af0d3e657b0c2a2eae34377eef24a4d7b122b123 100644 --- a/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallWayBillByHYCServiceImpl.java +++ b/erp-hyc-interfaces-backend/src/main/java/com/unlcn/erp/hyc/interfaces/backend/service/CallWayBillByHYCServiceImpl.java @@ -1,5 +1,6 @@ package com.unlcn.erp.hyc.interfaces.backend.service; + import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Maps; import com.unlcn.erp.hyc.interfaces.backend.bo.HYCWayBillDB; @@ -9,13 +10,12 @@ import com.unlcn.erp.hyc.interfaces.backend.enums.CallHYCUrlTypeEnum; import com.unlcn.erp.hyc.interfaces.base.mapper.*; import com.unlcn.erp.hyc.interfaces.base.model.*; import org.apache.commons.collections.CollectionUtils; - -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import java.math.BigDecimal; import java.text.SimpleDateFormat; @@ -472,7 +472,7 @@ public class CallWayBillByHYCServiceImpl implements CallWayBillByHYCService { Soshiphead soshiphead = soshipheadMapper.selectByPrimaryKey(soshipheadId); // Long dccount = soshiphead.getDccount(); //臨時合同賬期 Long dccount = null; - if(StringUtils.isNotBlank(db.getPayCycle())){ + if(!StringUtils.isEmpty(db.getPayCycle())){ if("10".equals(db.getPayCycle())){ //即付 dccount = 3L; }else if("20".equals(db.getPayCycle())){ //周付 @@ -585,7 +585,7 @@ public class CallWayBillByHYCServiceImpl implements CallWayBillByHYCService { // 选择支付方式 tPriceSheet.setnPayMethode(Objects.nonNull(payType) ? payType : 0);//1.现金 ,2.开票 // 确认账期 - if(StringUtils.isNotBlank(db.getPayCycle())){ + if(!StringUtils.isEmpty(db.getPayCycle())){ if("10".equals(db.getPayCycle())){ //即付 tPriceSheet.setnPaymentDays((short)3);//5.N+2 ,4.N+1 ,3.N,7.周 }else if("20".equals(db.getPayCycle())){ //周付 @@ -862,9 +862,11 @@ public class CallWayBillByHYCServiceImpl implements CallWayBillByHYCService { if (startCity.getVccityname().equals(soorder.getVcstartcity()) && endCity.getVccityname().equals(soorder.getVccityname())) { if ("中联物流自有车队".equals(db.getCarriername()) || db.getCarrierid() == 151) { soorder.setIsdispatch((short) 1); + soorder.setDcshipedqty((short)1); soorder.setHycwaybillcode(hycwaybilldetail.getWaybillcode()); } else { soorder.setIsdispatch((short) 0); + soorder.setDcshipedqty((short)1); } soorderMapper.updateDispatchByPrimaryKey(soorder); return iorderId; @@ -896,11 +898,13 @@ public class CallWayBillByHYCServiceImpl implements CallWayBillByHYCService { soorder.setDataresource("来源于慧运车导入"); soorder.setDcshipedqty(Short.valueOf("1")); - if ("中联物流自有车队".equals(db.getCarriername()) || db.getCarrierid() == 151) { - soorder.setIsdispatch((short) 1); + if("中联物流自有车队".equals(db.getCarriername()) || db.getCarrierid() == 151){ + soorder.setIsdispatch((short)1); + soorder.setDcshipedqty((short)0); soorder.setHycwaybillcode(hycwaybilldetail.getWaybillcode()); - } else { - soorder.setIsdispatch((short) 0); + }else{ + soorder.setIsdispatch((short)0); + soorder.setDcshipedqty((short)0); } SoorderExample example = new SoorderExample(); diff --git a/erp-hyc-interfaces-base/pom.xml b/erp-hyc-interfaces-base/pom.xml index 99dbfe7076f660e2bad5d71acecae1487aa88b48..8d732882cbdadb0cb566e7d3973631f3c18ec786 100644 --- a/erp-hyc-interfaces-base/pom.xml +++ b/erp-hyc-interfaces-base/pom.xml @@ -3,7 +3,7 @@ com.unlcn.erp.hyc.interfaces erp-hyc-interfaces - 1.2.0 + 1.3.2 4.0.0 diff --git a/erp-hyc-interfaces-base/src/main/resources/mappers/SoorderMapper.xml b/erp-hyc-interfaces-base/src/main/resources/mappers/SoorderMapper.xml index 9b5454efab44fbc9b4ed0775d8bcb6fe93c25dbb..5c17c17f2bcea8348036a5ae2361e1416d3d4510 100644 --- a/erp-hyc-interfaces-base/src/main/resources/mappers/SoorderMapper.xml +++ b/erp-hyc-interfaces-base/src/main/resources/mappers/SoorderMapper.xml @@ -1373,7 +1373,9 @@ - update SOORDER set ISDISPATCH = #{isdispatch,jdbcType=DECIMAL},HYCWAYBILLCODE = #{hycwaybillcode,jdbcType=VARCHAR} where ilineid = #{ilineid,jdbcType=DECIMAL} + update SOORDER set ISDISPATCH = #{isdispatch,jdbcType=DECIMAL},HYCWAYBILLCODE = #{hycwaybillcode,jdbcType=VARCHAR}, + DCSHIPEDQTY = #{dcshipedqty} + where ilineid = #{ilineid,jdbcType=DECIMAL} @@ -1444,6 +1446,7 @@ update SOORDER set IPAYID = #{ipayid,jdbcType=DECIMAL},DCPAY = #{dcpay,jdbcType=DECIMAL},DCPAYED = #{dcpayed,jdbcType=DECIMAL}, + IPAYID2 = #{ipayid2,jdbcType=DECIMAL}, diff --git a/pom.xml b/pom.xml index 76f57c1e3c54227a81f4e05b412f1caf3886302c..5099bd2607faf49e0d51f52faee3ec9f18281c2a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.unlcn.erp.hyc.interfaces erp-hyc-interfaces pom - 1.2.0 + 1.3.2 erp-hyc-interfaces-api erp-hyc-interfaces-base