完善维修领料退料

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java

@@ -46,7 +46,7 @@ public class AsBusrepairInventorybillRest {
         return asBusrepairInventorybillService.newQuitBill(dto);
     }
 
-    @PostMapping("/details")
+    @GetMapping("/details")
     @ApiOperation("详情")
     ResultBean<InventoryBillDetailsVo> details(@RequestParam("sid") String sid) {
         return asBusrepairInventorybillService.details(sid);

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml

@@ -15,25 +15,18 @@
     </select>
     <select id="getDetailsByBillSid"
             resultType="com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail">
-        SELECT
+        SELECT d.*
-            d.*
+        FROM as_busrepair_inventorybill AS b
-        FROM
-            as_busrepair_inventorybill AS b
                  LEFT JOIN as_busrepair_inventorybill_detail AS d ON b.sid = d.billSid
-        WHERE
+        WHERE b.sourceBillSid = #{busRepairBillSid}
-            b.sourceBillSid = #{busRepairBillSid}
           and b.busTypeKey = #{busTypeKey}
     </select>
     <select id="getGoodsDetailsByBillSid"
             resultType="com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail">
-        SELECT
+        SELECT d.*
-            d.*
+        FROM as_busrepair_inventorybill_detail AS d
-        FROM
+                 LEFT JOIN as_busrepair_inventorybill AS b ON b.sid = d.billSid
-            as_busrepair_inventorybill AS b
+        WHERE b.sourceBillSid = #{sid}
-                LEFT JOIN as_busrepair_inventorybill_detail AS d ON b.sid = d.billSid
+        GROUP BY d.goodsID
-        WHERE
-            b.sourceBillSid = #{sid}
-        GROUP BY
-            d.goodsID
     </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryQuery.java

@@ -30,6 +30,6 @@ public class WmsOutBillInventoryQuery implements Query {
 
     private String orgPath;
 
-    private String busrepairBillSid;//维修工单sid
+    private String busrepairBillsid;//维修工单sid
     private String name;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml

@@ -36,6 +36,7 @@
         wi.goodsSpuName,
         wi.goodsSkuTitle,
         wi.goodsSkuCode,
+        wi.goodsSkuSid,
         wi.goodsSkuOwnSpec,
         wi.unit,
         wi.warehouseSid,

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java

@@ -149,11 +149,11 @@ public class WmsOutBillService extends MybatisBaseService<WmsOutBillMapper, WmsO
         }*/
         IPage<WmsOutBill> page = PagerUtil.queryToPage(pagerQuery);
         IPage<WmsOutBillInventoryVo> pagging = baseMapper.getInventoryList(page, qw);
-        if (StringUtils.isNotBlank(query.getBusrepairBillSid())) {
+        if (StringUtils.isNotBlank(query.getBusrepairBillsid())) {
             List<WmsOutBillInventoryVo> records = pagging.getRecords();
             for (WmsOutBillInventoryVo record : records) {
                 //维修出入库查询已出库数量
-                String billSid = query.getBusrepairBillSid();
+                String billSid = query.getBusrepairBillsid();
                 String chuKuCount = asBusrepairInventorybillFeign.selOutBoundCount(billSid, "0", record.getGoodsID()).getData();
                 String ruKuCount = asBusrepairInventorybillFeign.selOutBoundCount(billSid, "1", record.getGoodsID()).getData();
                 BigDecimal count = new BigDecimal(chuKuCount).subtract(new BigDecimal(ruKuCount));

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBill.java

@@ -21,7 +21,8 @@ public class WmsShelfBill extends BaseEntity {
     private String createByName;
     @ApiModelProperty("0新建，1已完成")
     private Integer billState;
-
+    @ApiModelProperty("0新建，1已完成")
+    private String billStateValue;
     private String createOrgSid;
     private String useOrgSid;
     private String deptSid;

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.wms.biz.inventory.wmsshelfbill.app.AppShelfBillListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,4 +22,6 @@ public interface WmsShelfBillMapper extends BaseMapper<WmsShelfBill> {
     String selectNum(String goodsId);
 
     String selectCodeNum(String bill);
+
+    IPage<AppShelfBillListVo> applistPage(IPage<WmsShelfBill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsShelfBill> qw);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml

@@ -54,4 +54,19 @@
         order by id desc
             limit 1
     </select>
+    <select id="applistPage" resultType="com.yxt.wms.biz.inventory.wmsshelfbill.app.AppShelfBillListVo">
+        select wsb.sid shelvesSid,
+               wsb.billNo shelvesId,
+               DATE_FORMAT(wsb.createTime, '%Y-%m-%d') as shelvesCreateTime,
+               wsb.upShelfName shelvesUsers,
+               wsb.sourceBillNo receivingId,
+               wsb.billStateValue shelvesState,
+               r.createByName receivingUser
+        from wms_shelf_bill wsb
+                 LEFT JOIN wms_receipt_bill as r ON wsb.sourceBillSid = r.sid
+                 LEFT JOIN anrui_portal.sys_organization as s ON wsb.deptSid = s.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java

@@ -159,6 +159,13 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
             }
             String applyCode = getApplyCode(dto.getCreateOrgSid());
             wmsShelfBill.setBillNo(applyCode);
+            if (StringUtils.isNotBlank(dto.getBillState())) {
+                if (dto.getBillState().equals("0")){
+                    wmsShelfBill.setBillStateValue("新建");
+                } else if (dto.getBillState().equals("1")) {
+                    wmsShelfBill.setBillStateValue("完成");
+                }
+            }
             baseMapper.insert(wmsShelfBill);
         } else {
             WmsShelfBill wmsShelfBill = fetchBySid(sid);
@@ -179,6 +186,13 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
             if (!list.isEmpty()) {
                 wmsShelfBillDetailService.saveShelfDetails(sid, list);
             }
+            if (StringUtils.isNotBlank(dto.getBillState())) {
+                if (dto.getBillState().equals("0")){
+                    wmsShelfBill.setBillStateValue("新建");
+                } else if (dto.getBillState().equals("1")) {
+                    wmsShelfBill.setBillStateValue("完成");
+                }
+            }
             baseMapper.updateById(wmsShelfBill);
 
         }
@@ -394,12 +408,21 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
     }
 
     public PagerVo<AppShelfBillListVo> applistPage(PagerQuery<AppShelfBillListQuery> pq) {
-        PagerVo<AppShelfBillListVo> p = new PagerVo<>();
+        AppShelfBillListQuery query = pq.getParams();
-        List<AppShelfBillListVo> list = new ArrayList<>();
+        QueryWrapper<WmsShelfBill> qw = new QueryWrapper<>();
-        AppShelfBillListVo v = new AppShelfBillListVo();
+        if (StringUtils.isNotBlank(query.getUserSid())) {
-        v.setSid("222");
+            qw.eq("wsb.upShelfSid",query.getUserSid());
-        list.add(v);
+        }
-        p.setRecords(list);
+        //ToDo:添加查询条件
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.and(wrapper -> wrapper.like("wsb.billNo", query.getName())
+                    .or().like("wsb.sourceBillNo", query.getName())
+                    .or().like("wsb.billStateValue", query.getName())
+            );
+        }
+        IPage<WmsShelfBill> page = PagerUtil.queryToPage(pq);
+        IPage<AppShelfBillListVo> pagging = baseMapper.applistPage(page, qw);
+        PagerVo<AppShelfBillListVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppShelfBillListVo.java

@@ -10,11 +10,40 @@ import lombok.Data;
  */
 @Data
 public class AppShelfBillListVo implements Vo {
-    private String billNo; //单据编号
+    /**
-    private String billState;//单据状态
+     * 收货单号
-    private String receiptBillNo;//收货单号
+     */
-    private String receiptName;//收货人
+    private String receivingId;
-    private String shelName;//上架人
+    /**
-    private String time;//日期
+     * 收货人
-    private String sid;
+     */
+    private String receivingUser;
+    /**
+     * 记录按钮，有记录true
+     */
+    private boolean recordBtn;
+    /**
+     * 上架按钮，上架还有剩余true
+     */
+    private boolean shelvesBtn;
+    /**
+     * 上架单创建时间
+     */
+    private String shelvesCreateTime;
+    /**
+     * 上架单编号
+     */
+    private String shelvesId;
+    /**
+     * 上架单sid
+     */
+    private String shelvesSid;
+    /**
+     * 单据状态
+     */
+    private String shelvesState;
+    /**
+     * 上架人
+     */
+    private String shelvesUsers;
 }