md

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

@@ -109,12 +109,12 @@ public class EmisWaybillController extends EmisBaseController
             }
 
             if(!StringUtils.isEmpty(billCode) ){
-                waybillOrder = emisWaybillService.getWaybillDetailByBillCode(billCode);
+                waybillOrder = emisWaybillService.getWaybillOrderByBillCode(billCode);
                 if(waybillOrder==null){
                     return AjaxResult.error("运单不存在");
                 }
             }else if(!StringUtils.isEmpty(orderSn)){
-                waybillOrder = emisWaybillService.getWaybillDetailByOrderSn(orderSn);
+                waybillOrder = emisWaybillService.getWaybillOrderByOrderSn(orderSn);
                 if(waybillOrder==null){
                     return AjaxResult.error("订单不存在");
                 }

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

@@ -57,14 +57,14 @@ public interface IEmisWaybillService
      * @param billCode
      * @return
      */
-    public WaybillOrder getWaybillDetailByBillCode(String billCode) throws EmisBizError;
+    public WaybillOrder getWaybillOrderByBillCode(String billCode) throws EmisBizError;
 
     /**
      * 获取运单信息 根据 orderSn
      * @param orderSn
      * @return
      */
-    public WaybillOrder getWaybillDetailByOrderSn(String orderSn) throws EmisBizError;
+    public WaybillOrder getWaybillOrderByOrderSn(String orderSn) throws EmisBizError;
 
    /**
     * 草稿方式下单

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

@@ -118,20 +118,20 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
 
     /**
-     * 根据运单获取订单
+     * 根据外援运单获取订单
      * @param billCode
      * @return
      * @throws EmisBizError
      */
     @Override
-    public WaybillOrder getWaybillDetailByBillCode(String billCode) throws EmisBizError{
+    public WaybillOrder getWaybillOrderByBillCode(String billCode) throws EmisBizError{
 
         EmisWaybill dbEmisWaybill = this.selectEmisWaybillByBillCode(billCode);
         if(dbEmisWaybill==null){
             throw new EmisBizError(EmisBizErrorType.NOT_EXISTS,"运单不存在");
         }
 
-        return getWaybillDetailExtInfo(dbEmisWaybill);
+        return cvtEmisWaybillToWaybillOrder(dbEmisWaybill);
 
     }
 
@@ -142,14 +142,14 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
      * @throws EmisBizError
      */
     @Override
-    public WaybillOrder getWaybillDetailByOrderSn(String orderSn) throws EmisBizError{
+    public WaybillOrder getWaybillOrderByOrderSn(String orderSn) throws EmisBizError{
 
         EmisWaybill dbEmisWaybill = this.selectEmisWaybillByOrderSn(orderSn);
         if(dbEmisWaybill==null){
             throw new EmisBizError(EmisBizErrorType.NOT_EXISTS,"运单不存在");
         }
 
-        return getWaybillDetailExtInfo(dbEmisWaybill);
+        return cvtEmisWaybillToWaybillOrder(dbEmisWaybill);
 
     }
 
@@ -159,7 +159,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
      * @return
      * @throws EmisBizError
      */
-    public WaybillOrder getWaybillDetailExtInfo(EmisWaybill dbEmisWaybill) throws EmisBizError{
+    public WaybillOrder cvtEmisWaybillToWaybillOrder(EmisWaybill dbEmisWaybill) throws EmisBizError{
 
         // 设置运单锁单指令
         boolean isLock=isOutTimeLock(dbEmisWaybill);
@@ -231,7 +231,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
 
     /**
-     * 草稿下单接口
+     * 草稿下单
      * @param emisWaybillSave
      * @return
      */
@@ -262,7 +262,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
 
         // 开始下单
-        addWayBill(emisWaybillSave);
+        addNewWaybill(emisWaybillSave);
 
         return  1;
     }
@@ -438,19 +438,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             }
         }
 
-        // 新增
+        // 新开单
         if(isNew){
-            addWayBill(emisWaybillSave);
+            addNewWaybill(emisWaybillSave);
-        }else{
+        }
-
+        // 运单修改
-            // 判断运单状态，如果已锁账，则不允许修改
+        else{
-            // 下单超过 24小时
+            // 判断是否已超时及锁账
-            // （1）当天开单的，次日9点前允许修改面单；
-            //（2）当天开单次日上午9点后未锁帐，总部/财务中心修改；
-            //（3）若运单已签收、已确认账单、已收款、已锁帐，登记申请审批后进行修改；
-
-
             if(emisWaybillOld!=null ) {
+
                 if (isOutTimeLock(emisWaybillOld)) {
                     throw new EmisBizError(EmisBizErrorType.BILL_LOCK, "已超时，不允许修改");
                 }
@@ -469,7 +465,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             // 把历史发货日期带过来用于重新计算预估到到时间
             emisWaybillSave.setSendDate(emisWaybillOld.getSendDate());
 
-            updateWayBill(emisWaybillSave);
+            reUpdateWayBill(emisWaybillSave);
         }
 
         return  1;
@@ -779,10 +775,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
     }
 
     /**
-     * 新增下单
+     * 新开单
      * @param emisWaybillSave
      */
-    private void addWayBill(EmisWaybill emisWaybillSave) throws EmisBizError {
+    private void addNewWaybill(EmisWaybill emisWaybillSave) throws EmisBizError {
 
         // 子单号做扣减
         if("1".equals(emisWaybillSave.getBlGenSubbill())) {
@@ -884,7 +880,12 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
     }
 
 
-    private void updateWayBill(EmisWaybill emisWaybillSave) throws EmisBizError {
+    /**
+     * 运单修改更新
+     * @param emisWaybillSave
+     * @throws EmisBizError
+     */
+    private void reUpdateWayBill(EmisWaybill emisWaybillSave) throws EmisBizError {
 
         // 公共计算部分
         calcWayBillCommonInfo(emisWaybillSave,false);
@@ -1277,8 +1278,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
     }
 
 
-
-
     public static void main(String[] args) {
 
 //        Snowflake snowflake = IdUtil.getSnowflake(0, 0);