md

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java

@@ -16,7 +16,9 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.emis.domain.EmisSitePrepaidRecharge;
+import com.xdadan.erp.emis.domain.EmisWaybill;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.emis.service.IEmisWaybillService;
 import com.xdadan.erp.emis.utils.WaybillHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +55,9 @@ public class EmisWaybillAjustApplyController extends EmisBaseController
     @Autowired
     private IEmisWaybillAjustApplyService emisWaybillAjustApplyService;
 
+    @Autowired
+    private IEmisWaybillService emisWaybillService;
+
     /**
      * 查询运单调整申请列表
      */
@@ -231,6 +236,7 @@ public class EmisWaybillAjustApplyController extends EmisBaseController
                     emisWaybillAjustApply.setId(id);
 
                     emisWaybillAjustApplyService.auditCenterPass(emisWaybillAjustApply);
+
                 }catch (Exception ex){
                     ex.printStackTrace();
                     // 返回子定义异常

emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java

@@ -84,6 +84,17 @@ public interface IEmisWaybillService
     public int realSubmitOrder(EmisWaybill emisWaybill) throws EmisBizError;
 
 
+
+   /**
+    * 更新
+    * @param oldEmisWaybill
+    * @param emisWaybillSave
+    * @throws EmisBizError
+    */
+   public void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave) throws EmisBizError ;
+
+
+
     /**
      * 取消订单
      * @param emisWaybill

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java

@@ -13,16 +13,16 @@ package com.xdadan.erp.emis.service.impl;
 import java.util.Date;
 import java.util.List;
 
-import com.xdadan.erp.emis.domain.EmisSite;
+import com.alibaba.fastjson.JSONObject;
-import com.xdadan.erp.emis.domain.EmisSitePrepaidRecharge;
+import com.xdadan.erp.emis.domain.*;
-import com.xdadan.erp.emis.domain.EmisSiteSettleRecord;
 import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.emis.domain.vo.WaybillOrder;
 import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.emis.service.IEmisWaybillService;
 import com.xdadan.erp.emis.utils.WaybillHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.domain.EmisWaybillAjustApply;
 import com.xdadan.erp.emis.mapper.EmisWaybillAjustApplyMapper;
 import com.xdadan.erp.emis.service.IEmisWaybillAjustApplyService;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,6 +39,9 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
     @Autowired
     private EmisWaybillAjustApplyMapper emisWaybillAjustApplyMapper;
 
+    @Autowired
+    private IEmisWaybillService emisWaybillService;
+
     /**
      * 查询运单调整申请
      * 
@@ -175,6 +178,19 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
         emisWaybillAjustApply.setBlCenterConfirmed("1");
         emisWaybillAjustApply.setCenterConfirmManCode(getCurrentUser().getEmpCode());
 
+        // 运单更新
+        JSONObject jsonObject = JSONObject.parseObject(emisWaybillAjustApply.getJsonData());
+        JSONObject newValueJObj=jsonObject.getJSONObject("newValue");
+        WaybillOrder waybillOrder=newValueJObj.toJavaObject(WaybillOrder.class);
+        EmisWaybill emisWaybillSave = waybillOrder.toDb();
+
+        EmisWaybill emisWaybillOld = emisWaybillService.selectEmisWaybillByBillCode(emisWaybillAjustApply.getBillCode());
+        if(emisWaybillOld==null){
+            throw new EmisBizError(EmisBizErrorType.FAIL,"单号不存在！");
+        }
+
+        emisWaybillService.reUpdateWayBill(emisWaybillOld,emisWaybillSave);
+
         // 审核通过
         return emisWaybillAjustApplyMapper.auditCenterPass(emisWaybillAjustApply);
 

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java

@@ -1138,7 +1138,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
      * @param emisWaybillSave
      * @throws EmisBizError
      */
-    private void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave) throws EmisBizError {
+    @Override
+    public void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave) throws EmisBizError {
 
         // 公共计算部分
         calcWayBillCommonInfo(emisWaybillSave,false);