diff --git a/src/main/java/com/yem/wm/es/encasement/from/EncaseMentEdit.java b/src/main/java/com/yem/wm/es/encasement/from/EncaseMentEdit.java
index 68d4b3a8..19a04813 100644
--- a/src/main/java/com/yem/wm/es/encasement/from/EncaseMentEdit.java
+++ b/src/main/java/com/yem/wm/es/encasement/from/EncaseMentEdit.java
@@ -181,7 +181,7 @@ public class EncaseMentEdit extends AbstractBillPlugIn implements Plugin, Before
         DynamicObject dataEntity = model.getDataEntity(true);
         if ("statusconvertpjqr".equals(operateKey) || "statusconvertqrzj".equals(operateKey)) {
             String yemWeightconfirmed = (String) this.getModel().getValue("yem_weightconfirmed");
-            if (!yemWeightconfirmed.isEmpty()||"statusconvertpjqr".equals(operateKey)) {
+            if (!yemWeightconfirmed.isEmpty() || "statusconvertpjqr".equals(operateKey)) {
                 DynamicObjectCollection collection = dataEntity.getDynamicObjectCollection("yem_im_packinginfor_pi");
                 StringBuilder sb = new StringBuilder();
                 for (DynamicObject dynamicObject : collection) {
@@ -359,12 +359,14 @@ public class EncaseMentEdit extends AbstractBillPlugIn implements Plugin, Before
             dataEntity.set("yem_affirmmanpj", user);
             dataEntity.set("yem_affirmdatepj", new Date());
         }
-        if (!yemWeightconfirmed.isEmpty()&&"statusconvertqrzj".equals(operateKey)) {
+        if ("statusconvertqrzj".equals(operateKey)){
+            if (!yemWeightconfirmed.isEmpty()) {
                 dataEntity.set("yem_completionstatuszj", "B");
                 dataEntity.set("yem_affirmmanzj", user);
                 dataEntity.set("yem_affirmdatezj", new Date());
-        } else {
-            this.getView().showMessage("锁定重量是否确认为空！！！");
+            } else {
+                this.getView().showMessage("锁定重量是否确认为空！！！");
+            }
         }
 
         SaveServiceHelper.save(new DynamicObject[]{dataEntity});
@@ -424,7 +426,7 @@ public class EncaseMentEdit extends AbstractBillPlugIn implements Plugin, Before
 
             if ("statusconvertpjqr".equals(callBackId) || "statusconvertqrzj".equals(callBackId)) {
                 String yemWeightconfirmed = (String) this.getModel().getValue("yem_weightconfirmed");
-                if (!yemWeightconfirmed.isEmpty()||"statusconvertpjqr".equals(callBackId) ) {
+                if (!yemWeightconfirmed.isEmpty() || "statusconvertpjqr".equals(callBackId)) {
                     doConfirm(callBackId);
                 } else {
                     this.getView().showMessage("锁定重量是否确认为空！！！");