修复bug

inventory-admin/src/main/java/com/ruoyi/web/controller/inventory/BillsController.java

@@ -106,4 +106,9 @@ public class BillsController extends BaseController {
         return getDataTable(list);
     }
 
+
+
+
+
+
 }

inventory-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java

@@ -34,8 +34,8 @@ public class TestController extends BaseController
 {
     private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>();
     {
-        users.put(1, new UserEntity(1, "admin", "admin123", "15888888888"));
-        users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
+//        users.put(1, new UserEntity(1, "admin", "admin123", "15888888888"));
+//        users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
     }
 
     @ApiOperation("获取用户列表")

inventory-system/src/main/java/com/ruoyi/system/domain/Goods.java

@@ -39,6 +39,7 @@ public class Goods extends BaseEntity
     @Excel(name = "物品状态(0=在库,1=已出库)")
     private String goodsStatus;
 
+
     public void setId(Long id)
     {
         this.id = id;

inventory-system/src/main/java/com/ruoyi/system/service/impl/BillsDetailsServiceImpl.java

@@ -99,16 +99,16 @@ public class BillsDetailsServiceImpl implements IBillsDetailsService
             billsDetails.setGoodsNum(goods.getQuantityStock());
             billsDetails.setCreateBy(SecurityUtils.getLoginUser().getUser().getUserName());
             billsDetails.setCreateTime(new Date());
-            // 入库单据时
-            if (bills.getBillsType().equals(BillsType.RUKU.getCode())){
-                goodsUpdate.setGoodsStatus("0");
-                billsDetails.setGoodsStatus("0");
-            }
-            // 出库单据时
-            if (bills.getBillsType().equals(BillsType.CHUKU.getCode())){
-                goodsUpdate.setGoodsStatus("1");
-                billsDetails.setGoodsStatus("1");
-            }
+//            // 入库单据时
+//            if (bills.getBillsType().equals(BillsType.RUKU.getCode())){
+//                goodsUpdate.setGoodsStatus("0");
+//                billsDetails.setGoodsStatus("0");
+//            }
+//            // 出库单据时
+//            if (bills.getBillsType().equals(BillsType.CHUKU.getCode())){
+                goodsUpdate.setGoodsStatus(bills.getBillsType());
+                billsDetails.setGoodsStatus(bills.getBillsType());
+//            }
             billsDetailsMapper.insertBillsDetails(billsDetails);
             goodsMapper.updateGoods(goodsUpdate);
         }

inventory-system/src/main/java/com/ruoyi/system/service/impl/BillsServiceImpl.java

@@ -97,24 +97,26 @@ public class BillsServiceImpl implements IBillsService
             BillsDetails updateBillsDetails = new BillsDetails();
             updateBillsDetails.setBillsId(details.getBillsId());
             updateBillsDetails.setUpdateTime(new Date());
-            // 入库单据
-            if (bills.getBillsType().equals("0")){
-                goods.setGoodsStatus("0");
-                updateBillsDetails.setGoodsStatus("0");
-            }else if (bills.getBillsType().equals("1")){
-                // 出库单据
-                goods.setGoodsStatus("1");
-                updateBillsDetails.setGoodsStatus("1");
-            }else {
-                // 出调单据
-                goods.setGoodsStatus("2");
-                updateBillsDetails.setGoodsStatus("2");
-            }
+//            // 入库单据
+//            if (bills.getBillsType().equals("0")){
+//                goods.setGoodsStatus("0");
+//                updateBillsDetails.setGoodsStatus("0");
+//            }else if (bills.getBillsType().equals("1")){
+//                // 出库单据
+//                goods.setGoodsStatus("1");
+//                updateBillsDetails.setGoodsStatus("1");
+//            }else {
+//                // 出调单据
+                goods.setGoodsStatus(bills.getBillsType());
+                updateBillsDetails.setGoodsStatus(bills.getBillsType());
+//            }
             goodsList.add(goods);
             updateBillsDetailsList.add(updateBillsDetails);
         }
-        goodsService.updateBatchByGoodsCode(goodsList);
-        billsDetailsService.updateBatchByBillsId(updateBillsDetailsList);
+        if (billsDetailsList.size() > 0) {
+            goodsService.updateBatchByGoodsCode(goodsList);
+            billsDetailsService.updateBatchByBillsId(updateBillsDetailsList);
+        }
 
         return billsMapper.updateBills(bills);
     }

inventory-system/src/main/resources/mapper/system/GoodsMapper.xml

@@ -29,7 +29,12 @@
             <if test="goodsName != null  and goodsName != ''"> and goods_name like concat('%', #{goodsName}, '%')</if>
             <if test="goodsType != null  and goodsType != ''"> and goods_type = #{goodsType}</if>
             <if test="quantityStock != null "> and quantity_stock = #{quantityStock}</if>
-            <if test="goodsStatus != null "> and goods_status = #{goodsStatus}</if>
+            <if test="goodsStatus != null and goodsStatus != ''">
+                and goods_status in
+                <foreach collection="goodsStatus.split(',')" item="status" open="(" separator="," close=")">
+                    #{status}
+                </foreach>
+            </if>
             <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
         </where>
     </select>

inventory-ui/src/views/inventory/bills/index.vue

@@ -189,6 +189,21 @@
           clearable
           @keyup.enter.native="goodsHandleQuery"/>
         </el-form-item>
+        <el-form-item label="物品状态:">
+          <el-select
+            v-model="goodsParams.goodsStatus2"
+            placeholder="物品状态"
+            clearable
+            style="width: 150px"
+          >
+            <el-option
+              v-for="dict in bills_goods_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="备注:" prop="remark">
           <el-input v-model="goodsParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="goodsHandleQuery" />
         </el-form-item>
@@ -324,6 +339,9 @@ export default {
       },
       detailsList:[],
       detailsTotal: 0,
+      // 物品状态
+      bills_goods_status:[],
+      bills_type: "",
     };
   },
   created() {
@@ -429,10 +447,17 @@ export default {
     // 新增单据详情
     addBillsDetails(row){
       this.billsId = row.id
+      this.bills_type = row.billsType
       if(row.billsType === "0"){
-        this.goodsParams.goodsStatus = "1"
+        this.bills_goods_status = [
+          {label: "已出库",value: "1"},{label: "调度",value: "2"}
+        ]
+        this.goodsParams.goodsStatus = "1,2"
       }else {
-        this.goodsParams.goodsStatus = "0"
+        this.bills_goods_status = [
+          {label: "在库",value: "0"},{label: "调度",value: "2"}
+        ]
+        this.goodsParams.goodsStatus = "0,2"
       }
       this.getGoodsList()
       this.detailsOpen = true;
@@ -446,6 +471,9 @@ export default {
     },
     // 物品条件查询
     goodsHandleQuery(){
+      if(this.goodsParams.goodsStatus2 != null && this.goodsParams.goodsStatus2 != ""){
+        this.goodsParams.goodsStatus = this.goodsParams.goodsStatus2
+      }
       this.queryParams.pageNum = 1;
       this.getGoodsList();
     },
@@ -453,7 +481,14 @@ export default {
     goodsResetQuery(){
       this.goodsParams.goodsCode = null;
       this.goodsParams.goodsName = null;
+      this.goodsParams.goodsStatus2 = null;
       this.goodsParams.remark = null;
+
+      if(this.bills_type === "0"){
+        this.goodsParams.goodsStatus = "1,2"
+      }else {
+        this.goodsParams.goodsStatus = "0,2"
+      }
       this.goodsHandleQuery()
     },
     // 新增详情