修改是否旧件入库状态字段名

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java

@@ -75,8 +75,8 @@ public class AsBusrepairBill extends BaseEntity {
     private String memberCardSid;
     @ApiModelProperty("会员卡号")
     private String memberCarNumber;
-    @ApiModelProperty("旧件是否入库（适用于保内业务，0未入库，1已入库）")
-    private Integer oldIsInInventory;
+    @ApiModelProperty("旧件是否收回登记（0未收回，1已收回）")
+    private Integer oldIsReclaim;
     @ApiModelProperty("使用组织名称")
     private String useOrgName;
     @ApiModelProperty("创建组织名称")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java

@@ -71,6 +71,6 @@ public class AsBusrepairInventorybillDetail extends BaseEntity {
     @ApiModelProperty("领料人姓名")
     private String operName;
 
-    //旧件是否收回登记（0未收回登记，1已收回登记）
-    private Integer oldIsReclaim;
+    //旧件是否入库（适用于保内业务，0未入库，1已入库完成）
+    private Integer oldIsInInventory;
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -755,7 +755,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         AsBusrepairBill asBusrepairBill = fetchBySid(sid);
         if (asBusrepairBill.getNodeCode() == 5) {
             if (asBusrepairBill.getSubject().equals("保内")) {
-                if (asBusrepairBill.getOldIsInInventory() != 1) {
+                if (asBusrepairBill.getOldIsReclaim() != 1) {
                     return rb.setMsg("请先完成旧件入库，再进行操作！");
                 }
                 asBusrepairBill.setNodeCode(6);
@@ -781,7 +781,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         AsBusrepairBill asBusrepairBill = fetchBySid(sid);
         if (asBusrepairBill.getNodeCode() == 5) {
             if (asBusrepairBill.getSubject().equals("保内")) {
-                if (asBusrepairBill.getOldIsInInventory() != 1) {
+                if (asBusrepairBill.getOldIsReclaim() != 1) {
                     return rb.setMsg("请先完成旧件入库，再进行操作！");
                 }
                 asBusrepairBill.setNodeCode(6);