md

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

@@ -118,6 +118,11 @@ public class EmisWaybillController extends BaseController
                 waybillOrder.setTakePieceEmployeePhone(user.getPhonenumber());
             }
 
+            // 判断是否已经锁单
+
+
+
+
             return AjaxResult.success("获取成功",waybillOrder);
         }
         catch (Exception ex){

emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java

@@ -430,4 +430,7 @@ public class EmisWaybill extends BaseEntity
 //    private String billPicDispatchRmk;
     private String billPicGoodsRmk;
 
+    // 是否已锁单 T
+    private String lockFlag;
+
 }

emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java

@@ -321,6 +321,9 @@ public class WaybillOrder  implements Serializable {
     /* 上一网点点号 */
     private String lastSiteCode;
 
+    // 是否已锁单
+    private String lockFlag;
+
 
 
 
@@ -586,6 +589,8 @@ public class WaybillOrder  implements Serializable {
 //        voItem.setCreateSite(dbWaybill.getCreateSite());
 //        voItem.setUpdateSite(dbWaybill.getUpdateSite());
 
+        voItem.setLockFlag(dbWaybill.getLockFlag());
+
 
         return voItem;
     }

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

@@ -72,8 +72,6 @@ public class EmisSpecialCalcWeightServiceImpl implements IEmisSpecialCalcWeightS
     }
 
 
-
-
     /**
      * 修改特殊取重
      * 

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

@@ -228,6 +228,13 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         queryAttachment.setWaybillId(dbEmisWaybill.getId());
         List<EmisWaybillAttachment> dbAttachmentList=emisWaybillAttachmentMapper.selectEmisWaybillAttachmentList(queryAttachment);
 
+
+        boolean isLock=isWaybillLock(dbEmisWaybill);
+        if(isLock){
+            dbEmisWaybill.setLockFlag("T");
+        }
+
+
         return WaybillOrder.toVo(dbEmisWaybill,dbCargoList,dbFeeItemList,dbAttachmentList);
 
     }