盘库代码

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthFeign.java

@@ -50,8 +50,8 @@ import java.util.List;
  */
 @Api(tags = "月度盘库")
 @FeignClient(
-        contextId = "aaa-ScmVehInventorymonth",
-        name = "aaa",
+        contextId = "anrui-scm-ScmVehInventorymonth",
+        name = "anrui-scm",
         path = "v1/scmvehinventorymonth",
         fallback = ScmVehInventorymonthFeignFallback.class)
 public interface ScmVehInventorymonthFeign {

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/ScmVehInventoryreportFeign.java

@@ -50,8 +50,8 @@ import java.util.List;
  */
 @Api(tags = "盘库报告")
 @FeignClient(
-        contextId = "aaa-ScmVehInventoryreport",
-        name = "aaa",
+        contextId = "anrui-scm-ScmVehInventoryreport",
+        name = "anrui-scm",
         path = "v1/scmvehinventoryreport",
         fallback = ScmVehInventoryreportFeignFallback.class)
 public interface ScmVehInventoryreportFeign {
@@ -65,12 +65,12 @@ public interface ScmVehInventoryreportFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody ScmVehInventoryreportDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java

@@ -125,4 +125,7 @@ public interface ScmVehicleInventoryMapper extends BaseMapper<ScmVehicleInventor
     String getVin(@Param("vin") String vin);
 
     List<ScmVehicleStayInventoryVo> selInventory(@Param("vin") String vin, @Param("id") String id, @Param("useOrgSid") String useOrgSid);
+
+    @Select("select count(*) from scm_vehicle_inventory svi where svi.useOrgSid = #{useOrgSid} and InventoryState = '无' ")
+    int getInventoryState(@Param("useOrgSid") String useOrgSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@@ -167,12 +167,12 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         QueryWrapper<AppScmVehicleCarInventoryListPageVo> qw = appCarQueryWrapper(pagerQuery.getParams());
         AppScmVehicleCarInventoryListPageQuery params = pagerQuery.getParams();
         IPage<AppScmVehicleCarInventoryListPageVo> iPage = baseMapper.getCarInventoryList(page, qw, params.getName());
-        List<AppScmVehicleCarInventoryListPageVo> records = iPage.getRecords();
-        for (AppScmVehicleCarInventoryListPageVo record : records) {
-            if ("2".equals(record.getState())) {
-                record.setShowUpdataBtn(true);
-            }
-        }
+//        List<AppScmVehicleCarInventoryListPageVo> records = iPage.getRecords();
+//        for (AppScmVehicleCarInventoryListPageVo record : records) {
+//            if ("2".equals(record.getState())) {
+//                record.setShowUpdataBtn(true);
+//            }
+//        }
         return iPage;
     }
 
@@ -202,7 +202,6 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
     }
 
 
-
     /**
      * 手机端-获取盘库记录列表 查询条件
      *
@@ -217,6 +216,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         if (StringUtils.isNotBlank(query.getWarehouseSid())) {
             qw.eq("svi.locationSid", query.getWarehouseSid());
         }
+        qw.notIn("InventoryState", "无");
         String inventStartDate = query.getInventStartDate();
         String inventEndDate = query.getInventEndDate();
         qw.apply(StringUtils.isNotEmpty(inventStartDate), "date_format (InventoryDate,'%Y-%m-%d') >= date_format('" + inventStartDate + "','%Y-%m-%d')").
@@ -457,4 +457,13 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         int count = baseMapper.getToDoNum(useOrgSid);
         return rb.success().setData(String.valueOf(count));
     }
+
+    public boolean getInventoryState(String userSid) {
+        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        int count = baseMapper.getInventoryState(useOrgSid);
+        if (count == 0) {
+            return true;
+        }
+        return false;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java

@@ -59,7 +59,7 @@ public interface AppScmVehicleInventoryFeign {
     @ResponseBody
     public ResultBean getInventoryRecords(@PathVariable("userSid") String userSid);
 
-    @ApiOperation("手机端-获取盘库列表")
+    @ApiOperation("手机端-获取待盘库列表")
     @PostMapping("/getInventoryList")
     @ResponseBody
     public ResultBean<PagerVo<InventoryListPageVo>> getInventoryList(@RequestBody PagerQuery<InventoryListPageQuery> pagerQuery);
@@ -74,7 +74,7 @@ public interface AppScmVehicleInventoryFeign {
     @ResponseBody
     public ResultBean<StayInventoryInfoVo> getInventory(@PathVariable("recordSid") String recordSid);
 
-    @ApiOperation("手机端-初始化盘库记录")
+    @ApiOperation("手机端-初始化盘库记录-弃用")
     @GetMapping("/getInventoryByRecordSid/{recordSid}")
     @ResponseBody
     public ResultBean<StayInventoryInfoVo> getInventoryByRecordSid(@PathVariable("recordSid") String recordSid);
@@ -84,7 +84,7 @@ public interface AppScmVehicleInventoryFeign {
     @ResponseBody
     public ResultBean saveInventory(@RequestBody StayInventoryDto dto);
 
-    @ApiOperation("手机端-保存盘库记录操作")
+    @ApiOperation("手机端-保存盘库记录操作-弃用")
     @PostMapping("/saveInventoryByRecordSid")
     @ResponseBody
     public ResultBean saveInventoryByRecordSid(@RequestBody StayInventoryDto dto);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageQuery.java

@@ -19,7 +19,7 @@ public class CarInventoryListPageQuery implements Query {
     @ApiModelProperty("存放地点sid")
     private String warehouseSid;
 
-    @ApiModelProperty("盘库状态 通过1 不通过 2")
+    @ApiModelProperty("盘库状态")
     private String state;
 
     @ApiModelProperty("使用组织分公司sid")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/CarInventoryListPageVo.java

@@ -13,10 +13,10 @@ public class CarInventoryListPageVo implements Vo {
     @ApiModelProperty("车架号")
     private String vin;
 
-    @ApiModelProperty("合格证状态")
-    private String certificateState;
+//    @ApiModelProperty("合格证状态")
+//    private String certificateState;
 
-    @ApiModelProperty("状态")
+    @ApiModelProperty("盘库状态状态")
     private String state;
 
     @ApiModelProperty("最新盘库日期")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inventory/AppScmVehicleInventoryService.java

@@ -30,6 +30,7 @@ import com.yxt.anrui.scm.api.scmvehicleinventory.*;
 import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryListPageQuery;
 import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleStayInventoryListPageVo;
 import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryFeign;
+import com.yxt.anrui.scm.api.scmvehinventorymonth.ScmVehInventorymonthFeign;
 import com.yxt.anrui.terminal.api.supplychain.inventory.*;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -60,6 +61,9 @@ public class AppScmVehicleInventoryService {
     @Autowired
     ScmVehicleStayInventoryFeign scmVehicleStayInventoryFeign;
 
+    @Autowired
+    ScmVehInventorymonthFeign scmVehInventorymonthFeign;
+
     /**
      * 手机端-判断是否生成盘库记录
      *
@@ -67,13 +71,12 @@ public class AppScmVehicleInventoryService {
      * @return
      */
     public ResultBean getInventoryRecords(String userSid) {
-//        ResultBean resultBean = scmVehicleStayInventoryFeign.getInventoryRecords(userSid);
-//        return resultBean;
-        return null;
+        ResultBean resultBean = scmVehInventorymonthFeign.getInventoryRecords(userSid);
+        return resultBean;
     }
 
     /**
-     * 手机端-获取盘库列表
+     * 手机端-获取待盘库列表
      *
      * @param pagerQuery
      * @return

doc/databases/scm_tables_vehicle.sql

@@ -275,4 +275,54 @@ CREATE TABLE `scm_vehicle_patrolinspectionsheet`
     PRIMARY KEY (`id`),
     KEY                   `id` (`id`)
 ) ENGINE = INNODB
-  DEFAULT CHARSET = utf8 COMMENT ='巡检单';
+  DEFAULT CHARSET = utf8 COMMENT ='巡检单';
+
+
+-- 10、月度盘库
+DROP TABLE IF EXISTS `scm_veh_inventoryMonth`;
+CREATE TABLE `scm_veh_inventoryMonth`
+(
+    `id`            int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`           varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`   int(32) DEFAULT '0' COMMENT '版本锁',
+    `createTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`      int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`         int(32) DEFAULT '1' COMMENT '盘库报告生成状态（0 未生成 1 已生成）',
+    `isDelete`      int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`       varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`   varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`   varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `billNo`        varchar(64)          DEFAULT NULL COMMENT '编号（yyyyMMdd）',
+    `createOrgSid`  varchar(64)          DEFAULT NULL COMMENT '创建组织',
+    `createOrgName` varchar(64)          DEFAULT NULL COMMENT '创建组织名称',
+    `useOrgSid`     varchar(64)          DEFAULT NULL COMMENT '使用组织',
+    `useOrgName`    varchar(64)          DEFAULT NULL COMMENT '使用组织名称',
+    PRIMARY KEY (`id`),
+    KEY             `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='月度盘库';
+
+-- 5、盘库报告
+DROP TABLE IF EXISTS `scm_veh_inventoryReport`;
+CREATE TABLE `scm_veh_inventoryReport`
+(
+    `id`            int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`           varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`   int(32) DEFAULT '0' COMMENT '版本锁',
+    `createTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`      int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`         int(32) DEFAULT '1' COMMENT '状态',
+    `isDelete`      int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`       varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`   varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`   varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `mainSid`       varchar(64)          DEFAULT NULL COMMENT '月度盘库sid',
+    `receiverSids`  varchar(64)          DEFAULT NULL COMMENT '接收人sid',
+    `receiverNames` varchar(64)          DEFAULT NULL COMMENT '接收人姓名',
+    `reportContent` varchar(64)          DEFAULT NULL COMMENT '盘库报告内容',
+    PRIMARY KEY (`id`),
+    KEY             `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='盘库报告';