盘库接口开发

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java

@@ -30,6 +30,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -76,6 +77,18 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
 	@PostMapping("/save")
 	public ResultBean save(@RequestBody BaseVehinstallDto dto){
 		ResultBean rb = ResultBean.fireFail();
+		String vinNo = dto.getVinNo();
+		String costPrice = dto.getCostPrice();
+		String guidePrice = dto.getGuidePrice();
+		if (StringUtils.isBlank(vinNo)){
+			return rb.setMsg("请选择主车车架号");
+		}
+		if (StringUtils.isBlank(costPrice)){
+			return rb.setMsg("请填写厂家结算价");
+		}
+		if (StringUtils.isBlank(guidePrice)){
+			return rb.setMsg("请填写销售指导价");
+		}
 		baseVehinstallService.saveOrUpdateDto(dto);
 		return rb.success();
 	}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryQuery.java

@@ -51,21 +51,14 @@ public class ScmVehicleInventoryQuery implements Query {
 
 	@ApiModelProperty("车架号")
     private String mainSid; // 车架号
+    @ApiModelProperty("盘库开始日期")
+    private String InventStartDate;
+    @ApiModelProperty("盘库结束日期")
+    private String InventEndDate;
 	@ApiModelProperty("存放地点sid")
     private String locationSid; // 存放地点sid
-	@ApiModelProperty("存放地点")
-    private String location; // 存放地点
-	@ApiModelProperty("合格证（有/无）")
-    private String certificate; // 合格证（有/无）
-	@ApiModelProperty("盘库日期")
-    private String InventoryDate; // 盘库日期
-	@ApiModelProperty("盘库人员")
-    private String InventoryName; // 盘库人员
 	@ApiModelProperty("盘库状态 通过/未通过")
     private String InventoryState; // 盘库状态 通过/未通过
 	@ApiModelProperty("创建组织")
     private String createOrgSid; // 创建组织
-	@ApiModelProperty("使用组织")
-    private String useOrgName; // 使用组织
-
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java

@@ -53,21 +53,14 @@ public class ScmVehicleInventoryVo implements Vo {
 
 	@ApiModelProperty("车架号")
     private String mainSid; // 车架号
-	@ApiModelProperty("存放地点sid")
-    private String locationSid; // 存放地点sid
 	@ApiModelProperty("存放地点")
     private String location; // 存放地点
-	@ApiModelProperty("合格证（有/无）")
-    private String certificate; // 合格证（有/无）
 	@ApiModelProperty("盘库日期")
     private String InventoryDate; // 盘库日期
 	@ApiModelProperty("盘库人员")
     private String InventoryName; // 盘库人员
 	@ApiModelProperty("盘库状态 通过/未通过")
     private String InventoryState; // 盘库状态 通过/未通过
-	@ApiModelProperty("创建组织")
-    private String createOrgSid; // 创建组织
-	@ApiModelProperty("使用组织")
-    private String useOrgName; // 使用组织
-
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryFeign.java

@@ -87,5 +87,4 @@ public interface ScmVehicleStayInventoryFeign {
     @ResponseBody
     public ResultBean<PagerVo<AppScmVehicleStayInventoryListPageVo>> getInventoryList(@RequestBody PagerQuery<AppScmVehicleStayInventoryListPageQuery> pagerQuery);
 
-
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryQuery.java

@@ -53,15 +53,6 @@ public class ScmVehicleStayInventoryQuery implements Query {
     private String mainSid; // 车架号
 	@ApiModelProperty("存放地点sid")
     private String locationSid; // 存放地点sid
-	@ApiModelProperty("存放地点")
-    private String location; // 存放地点
-	@ApiModelProperty("上次盘库日期")
-    private String InventoryDate; // 上次盘库日期
-	@ApiModelProperty("上次盘库人员")
-    private String InventoryName; // 上次盘库人员
 	@ApiModelProperty("创建组织")
     private String createOrgSid; // 创建组织
-	@ApiModelProperty("使用组织")
-    private String useOrgName; // 使用组织
-
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryVo.java

@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui_scm(anrui_scm) <br/>
  * File: ScmVehicleStayInventoryVo.java <br/>
@@ -53,17 +55,10 @@ public class ScmVehicleStayInventoryVo implements Vo {
 
 	@ApiModelProperty("车架号")
     private String mainSid; // 车架号
-	@ApiModelProperty("存放地点sid")
-    private String locationSid; // 存放地点sid
 	@ApiModelProperty("存放地点")
     private String location; // 存放地点
 	@ApiModelProperty("上次盘库日期")
-    private String InventoryDate; // 上次盘库日期
+    private Date InventoryDate; // 上次盘库日期
 	@ApiModelProperty("上次盘库人员")
     private String InventoryName; // 上次盘库人员
-	@ApiModelProperty("创建组织")
-    private String createOrgSid; // 创建组织
-	@ApiModelProperty("使用组织")
-    private String useOrgName; // 使用组织
-
 }

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

@@ -75,7 +75,22 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
 	
 	public PagerVo<ScmVehicleInventoryVo> listPageVo(PagerQuery<ScmVehicleInventoryQuery> pq) {
 		ScmVehicleInventoryQuery query = pq.getParams();
-		QueryWrapper<ScmVehicleInventory> qw = createQueryWrapper(query);
+		QueryWrapper<ScmVehicleInventory> qw = new QueryWrapper<>();
+		qw.eq("createOrg",query.getCreateOrgSid());
+		if (StringUtils.isNotBlank(query.getMainSid())){
+			qw.like("mainSid",query.getMainSid());
+		}
+		if (StringUtils.isNotBlank(query.getLocationSid())){
+			qw.eq("locationSid",query.getLocationSid());
+		}
+		if (StringUtils.isNotBlank(query.getInventoryState())){
+			qw.eq("InventoryState",query.getInventoryState());
+		}
+		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')").
+				apply(StringUtils.isNotEmpty(inventEndDate), "date_format (InventoryDate,'%Y-%m-%d') <= date_format('" + inventEndDate + "','%Y-%m-%d')"
+				);
 		IPage<ScmVehicleInventory> page = PagerUtil.queryToPage(pq);
 		IPage<ScmVehicleInventoryVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<ScmVehicleInventoryVo> p = PagerUtil.pageToVo(pagging, null);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.java

@@ -65,7 +65,7 @@ public interface ScmVehicleStayInventoryMapper extends BaseMapper<ScmVehicleStay
 
     List<ScmVehicleStayInventoryVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehicleStayInventory> qw);
 
-    @Select("select * from scm_vehicle_stay_inventory")
+    @Select("select * from scm_vehicle_stay_inventory where isDelete = 0")
     List<ScmVehicleStayInventoryVo> selectListVo();
 
     /**

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryRest.java

@@ -98,9 +98,7 @@ public class ScmVehicleStayInventoryRest implements ScmVehicleStayInventoryFeign
 
     @Override
     public ResultBean getInventoryRecords(String userSid) {
-        ResultBean rb = ResultBean.fireFail();
-        scmVehicleStayInventoryService.getInventoryRecords(userSid);
-        return rb.success();
+        return scmVehicleStayInventoryService.getInventoryRecords(userSid);
     }
 
     @Override

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java

@@ -126,8 +126,13 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
      * @param userSid
      */
     @Transactional(rollbackFor = Exception.class)
-    public void getInventoryRecords(String userSid) {
+    public ResultBean getInventoryRecords(String userSid) {
+        ResultBean rb = ResultBean.fireFail();
         List<AppScmInventoryRecordsVo> list = baseVehicleFeign.selectInventoryRecords(userSid).getData();
+        List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = baseMapper.selectListVo();
+        if (scmVehicleStayInventoryVos.size() > 0){
+            return rb.setMsg("盘库失败，请查看是否有未盘库的记录");
+        }
         for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) {
             ScmVehicleStayInventory scmVehicleStayInventory = new ScmVehicleStayInventory();
             scmVehicleStayInventory.setMainSid(appScmInventoryRecordsVo.getVin());
@@ -135,6 +140,7 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService<ScmVehicl
             scmVehicleStayInventory.setLocation(appScmInventoryRecordsVo.getWarehouse());
             save(scmVehicleStayInventory);
         }
+        return rb.success();
     }
 
     /**