优化完善仓库管理

yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyDetailsVo.java

@@ -240,5 +240,10 @@ public class AsBillSettelApplyDetailsVo implements Vo {
     private String waitorName;
 
     private String procInsId;
-
+    private String outCost; //外出成本
+    private String outPrint; //外出利润额
+    private String subsidyCost; //厂家补助成本
+    private String subsidyPrint; //厂家补助利润额
+    private String rescueCost; //施救费成本
+    private String rescuePrint; //施救费利润额
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java

@@ -284,6 +284,9 @@ public class AsBillSettelApplyService extends MybatisBaseService<AsBillSettelApp
                     vo.setSubject(data.getSubject());
                     vo.setIsGoOut(data.getIsGoOut());
                     vo.setIsGoOut2(data.getIsGoOut2());
+                    if (StringUtils.isNotBlank(data.getDiscountAmount())) {
+                        vo.setDiscountAmount(data.getDiscountAmount());
+                    }
                     if (StringUtils.isNotBlank(data.getMobile())) {
                         vo.setMobile(data.getMobile());
                     }

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

@@ -317,8 +317,8 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                     spec.setTaxPrice(new BigDecimal(dto.getRescueKPAmount()));
                 }
                 spec.setCount(1);
-                spec.setCost(new BigDecimal(dto.getRescueAmount()));
-                spec.setCostTotal(new BigDecimal(dto.getRescueAmount()));
+//                spec.setCost(new BigDecimal(dto.getRescueAmount()));
+//                spec.setCostTotal(new BigDecimal(dto.getRescueAmount()));
                 spec.setBillBusTypeKey("003");
                 spec.setBillBusTypeValue("附加项目");
                 asBusrepairBillAitemspecService.insert(spec);
@@ -336,8 +336,8 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                     spec.setTaxPrice(new BigDecimal(dto.getSubsidyKPAmount()));
                 }
                 spec.setCount(1);
-                spec.setCost(new BigDecimal(dto.getSubsidyAmount()));
-                spec.setCostTotal(new BigDecimal(dto.getSubsidyAmount()));
+//                spec.setCost(new BigDecimal(dto.getSubsidyAmount()));
+//                spec.setCostTotal(new BigDecimal(dto.getSubsidyAmount()));
                 spec.setBillBusTypeKey("003");
                 spec.setBillBusTypeValue("附加项目");
                 asBusrepairBillAitemspecService.insert(spec);
@@ -355,8 +355,8 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                     spec.setTaxPrice(new BigDecimal(dto.getOutKPAmount()));
                 }
                 spec.setCount(1);
-                spec.setCost(new BigDecimal(dto.getOutAmount()));
-                spec.setCostTotal(new BigDecimal(dto.getOutAmount()));
+//                spec.setCost(new BigDecimal(dto.getOutAmount()));
+//                spec.setCostTotal(new BigDecimal(dto.getOutAmount()));
                 spec.setBillBusTypeKey("003");
                 spec.setBillBusTypeValue("附加项目");
                 asBusrepairBillAitemspecService.insert(spec);

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java

@@ -30,6 +30,7 @@ public class WmsWarehouseInfoRest {
     public ResultBean<PagerVo<WmsWarehouseInfoVo>> listPage(@RequestBody PagerQuery<WmsWarehouseInfoQuery> pq) {
         return wmsWarehouseService.listPage(pq);
     }
+
     @ApiOperation("查询所有的仓库")
     @PostMapping("/listAll")
     public ResultBean<List<WmsWarehouseInfo>> listAll(@RequestBody OrgPathQuery query) {
@@ -56,20 +57,21 @@ public class WmsWarehouseInfoRest {
 
     @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         wmsWarehouseService.delAll(sids);
         return rb.success();
     }
+
     @ApiOperation("更改可用状态")
     @GetMapping("/updateStatus/{sid}/{state}")
-    public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("state")String state) {
-        return wmsWarehouseService.updateIsEnable(sid,state);
+    public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("state") String state) {
+        return wmsWarehouseService.updateIsEnable(sid, state);
     }
 
     @ApiOperation("查询所有仓库")
     @GetMapping("/selectAll")
-    public ResultBean<List<WmsWarehouseInfoAllVo>> selectAll(){
+    public ResultBean<List<WmsWarehouseInfoAllVo>> selectAll() {
         ResultBean rb = ResultBean.fireFail();
         List<WmsWarehouseAreaAllVo> wmsWarehouseAreaAllVos = wmsWarehouseService.selectAll();
         return rb.success().setData(wmsWarehouseAreaAllVos);
@@ -78,9 +80,18 @@ public class WmsWarehouseInfoRest {
 
     @ApiOperation("查询仓库管理员")
     @GetMapping("/selMangerByRole")
-    public ResultBean<List<MangerVo>> selMangerByRole(@RequestParam("useOrgSid") String useOrgSid){
+    public ResultBean<List<MangerVo>> selMangerByRole(@RequestParam("useOrgSid") String useOrgSid) {
         ResultBean rb = ResultBean.fireFail();
         List<MangerVo> vos = wmsWarehouseService.selMangerByRole(useOrgSid);
         return rb.success().setData(vos);
     }
+
+
+    @ApiOperation("根据仓库类型查询所有仓库")
+    @GetMapping("/selectWarehouseByType")
+    public ResultBean<List<WmsWarehouseInfoAllVo>> selectWarehouseByType(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("warehouseTypeValue") String warehouseTypeValue) {
+        ResultBean rb = ResultBean.fireFail();
+        List<WmsWarehouseInfoAllVo> wmsWarehouseInfoAllVos = wmsWarehouseService.selectWarehouseByType(useOrgSid, warehouseTypeValue);
+        return rb.success().setData(wmsWarehouseInfoAllVos);
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java

@@ -33,4 +33,7 @@ public interface WmsWarehouseInfoMapper extends BaseMapper<WmsWarehouseInfo> {
     List<WmsWarehouseInfo> listAll(@Param("useOrgSid") String useOrgSid);
 
     int selectNum(@Param("billCode") String billCode);
+
+    @Select("select sid,warehouseName from wms_warehouse_info where useOrgSid =#{useOrgSid} and isDelete = 0 and usageStatus = '1' and warehouseTypeValue =#{warehouseTypeValue}")
+    List<WmsWarehouseInfoAllVo> selectWarehouseByType(@Param("useOrgSid")String useOrgSid, @Param("warehouseTypeValue")String warehouseTypeValue);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoQuery.java

@@ -13,6 +13,7 @@ public class WmsWarehouseInfoQuery implements Query {
     private String name;
     private String code;
     private String address;
+    private String warehouseTypeValue;
     @ApiModelProperty("菜单路由")
     private String menuUrl;
     @ApiModelProperty("组织全路径sid")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java

@@ -102,6 +102,9 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
         if (StringUtils.isNotBlank(query.getAddress())) {
             qw.like("w.address", query.getAddress());
         }
+        if (StringUtils.isNotBlank(query.getWarehouseTypeValue())) {
+            qw.eq("w.warehouseTypeValue", query.getWarehouseTypeValue());
+        }
         qw.ne("w.isDelete", 1);
         IPage<WmsWarehouseInfo> page = PagerUtil.queryToPage(pq);
         IPage<WmsWarehouseInfoVo> pagging = baseMapper.listPage(page, qw);
@@ -263,4 +266,8 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
         }
         return list;
     }
+
+    public List<WmsWarehouseInfoAllVo> selectWarehouseByType(String useOrgSid, String warehouseTypeValue) {
+        return baseMapper.selectWarehouseByType(useOrgSid,warehouseTypeValue);
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneInitVo.java

@@ -19,6 +19,5 @@ public class WmsWarehouseZoneInitVo {
     private String volume;//区域面积
     private String unit;//计量单位
     private String userSid; //用户sid
-
-
+    private String warehouseTypeValue;//仓库类型
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneMapper.xml

@@ -15,7 +15,7 @@
 
     <select id="listPage" resultType="com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZoneVo">
         select
-        a.*,b.warehouseName as warehouseName
+        a.*,b.warehouseName as warehouseName,b.warehouseTypeValue as warehouseTypeValue
         from wms_warehouse_zone a
         left join wms_warehouse_info b on b.sid=a.warehouseSid
         LEFT JOIN anrui_portal.sys_organization as s ON b.useOrgSid = s.sid
@@ -53,7 +53,8 @@
     <select id="initialization" resultType="com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZoneInitVo">
         select a.*,
                a.createBySid           as userSid,
-               b.warehouseName         as warehouseName
+               b.warehouseName         as warehouseName,
+               b.warehouseTypeValue
         from wms_warehouse_zone a
                  left join wms_warehouse_info b on b.sid = a.warehouseSid
         where a.sid = #{sid}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneQuery.java

@@ -15,6 +15,7 @@ public class WmsWarehouseZoneQuery implements Query {
     private String name;//名字
     private String code;//编码
     private String warehouseSid;//仓库
+    private String warehouseTypeValue;//仓库
 
     @ApiModelProperty("菜单路由")
     private String menuUrl;

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneService.java

@@ -89,6 +89,9 @@ public class WmsWarehouseZoneService extends MybatisBaseService<WmsWarehouseZone
         if (StringUtils.isNotBlank(query.getWarehouseSid())) {
             qw.eq("b.sid", query.getWarehouseSid());
         }
+        if (StringUtils.isNotBlank(query.getWarehouseTypeValue())) {
+            qw.eq("b.warehouseTypeValue", query.getWarehouseTypeValue());
+        }
         qw.ne("a.isDelete", "1");
         IPage<WmsWarehouseZone> page = PagerUtil.queryToPage(pq);
         IPage<WmsWarehouseZoneVo> pagging = baseMapper.listPage(page, qw);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneVo.java

@@ -23,4 +23,5 @@ public class WmsWarehouseZoneVo implements Vo {
     private String volume;//区域面积
     private String unit;//计量单位
     private String warehouseName;//仓库名称
+    private String warehouseTypeValue;//仓库类型
 }