仓库调整

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataGoodsAreaVO.java

@@ -39,16 +39,6 @@ public class BasicdataGoodsAreaVO extends BasicdataGoodsAreaEntity {
 	@ApiModelProperty(value = "仓库名称")
 	private String warehouseName;
 
-	@ApiModelProperty(value = "创建人名称")
-	private String createUserName;
-
-	@ApiModelProperty(value = "部门名称")
-	private String createDeptName;
-
-	@ApiModelProperty(value = "创建时间")
-	private Date createTimeFormat;
-
-
 	private String label;
 
 	private String value;

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml

@@ -93,7 +93,7 @@
             INNER JOIN logpm_warehouse_goods_area AS goods_area ON goods_allocation.goods_area_id = goods_area.id
             INNER JOIN logpm_warehouse_warehouse AS warehouse ON goods_allocation.warehouse_id = warehouse.id
         <where>
-            goods_allocation.is_deleted=0
+            goods_allocation.is_deleted = 0
             <if test="po.warehouseId!=null and po.warehouseId!=''">
               AND  goods_allocation.warehouse_id=#{po.warehouseId}
             </if>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml

@@ -45,7 +45,7 @@
         SELECT
         goods_area.tenant_id,
         goods_area.create_user,
-        goods_area.create_time AS createTimeFormat,
+        goods_area.create_time,
         goods_area.update_user,
         goods_area.update_time,
         goods_area.status,
@@ -61,14 +61,10 @@
         goods_area.headline,
         goods_area.enable_status,
         goods_area.area_type,
-        warehouse.NAME AS warehouseName,
-        blade_user.name AS createUserName,
-        blade_dept.dept_name AS createDeptName
+        warehouse.NAME AS warehouseName
         FROM
         logpm_warehouse_goods_area AS goods_area
         INNER JOIN  logpm_warehouse_warehouse AS warehouse ON goods_area.warehouse_id = warehouse.id
-        INNER JOIN bladex.blade_user AS blade_user ON goods_area.create_user = blade_user.id
-        INNER JOIN bladex.blade_dept AS blade_dept ON goods_area.create_dept = blade_dept.id
        <where>
             goods_area.is_deleted = '0'
            <if test="po.warehouseId != null and po.warehouseId!=''">
@@ -77,7 +73,7 @@
            <if test="po.enableStatus != null and po.enableStatus!=''">
                and goods_area.enable_status = #{po.enableStatus}
            </if>
-           <if test="po.isStrageAreaData != null and po.isStrageAreaData!=''">
+           <if test="po.areaType != null and po.areaType!=''">
                and goods_area.area_type = #{po.areaType}
            </if>
        </where>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java

@@ -101,19 +101,13 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 	@Override
 	public boolean insertGoodsAllocation( BasicdataGoodsAllocationDTO basicdataGoodsAllocationDto) {
 		BasicdataGoodsAllocationEntity basicdataGoodsAllocationEntity = new BasicdataGoodsAllocationEntity();
-		List<String> nodeInfo = basicdataGoodsAllocationDto.getNodeInfo();
-		if (Func.isEmpty(nodeInfo)){
-			log.error("参数不合法：{}"+nodeInfo);
+		if (Func.isEmpty(basicdataGoodsAllocationDto)){
+			log.error("参数不合法：{}"+basicdataGoodsAllocationDto);
 			return false;
 		}
-
-
 		BeanUtils.copyProperties(basicdataGoodsAllocationDto,basicdataGoodsAllocationEntity);
 		BladeUser user = AuthUtil.getUser();
 		Long userId = user.getUserId();
-		basicdataGoodsAllocationEntity.setWarehouseId( nodeInfo.get(0));
-		basicdataGoodsAllocationEntity.setGoodsAreaId( nodeInfo.get(1));
-		basicdataGoodsAllocationEntity.setGoodsShelfId( nodeInfo.get(2));
 		basicdataGoodsAllocationEntity.setEnableStatus("1");
 		basicdataGoodsAllocationEntity.setStatus(1);
 		basicdataGoodsAllocationEntity.setIsDeleted(0);
@@ -124,7 +118,6 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 		basicdataGoodsAllocationEntity.setUpdateTime(new Date());
 		basicdataGoodsAllocationEntity.setUpdateUser(userId);
 		basicdataGoodsAllocationEntity.setTenantId(user.getTenantId());
-
 		boolean result = SqlHelper.retBool(goodsAllocationMapper.insert(basicdataGoodsAllocationEntity));
 
 
@@ -143,31 +136,13 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 
 	@Override
 	public boolean updateGoodsAllocation(BasicdataGoodsAllocationDTO basicdataGoodsAllocationDto) {
-		List<String> nodeInfo = basicdataGoodsAllocationDto.getNodeInfo();
 		boolean result = false;
-		if (Func.isEmpty(nodeInfo)){
+		if (Func.isEmpty(basicdataGoodsAllocationDto)){
 			return result;
-		}else {
+		}
 			BasicdataGoodsAllocationEntity basicdataGoodsAllocationEntity = new BasicdataGoodsAllocationEntity();
 			BeanUtils.copyProperties(basicdataGoodsAllocationDto,basicdataGoodsAllocationEntity);
-			if (nodeInfo.size()==1){
-				basicdataGoodsAllocationEntity.setWarehouseId(nodeInfo.get(0));
-				basicdataGoodsAllocationEntity.setGoodsAreaId("");
-				basicdataGoodsAllocationEntity.setGoodsShelfId("");
-			}else if (nodeInfo.size()==2){
-				basicdataGoodsAllocationEntity.setWarehouseId(nodeInfo.get(0));
-				basicdataGoodsAllocationEntity.setWarehouseId(nodeInfo.get(1));
-				basicdataGoodsAllocationEntity.setGoodsShelfId("");
-
-			}else if (nodeInfo.size()==3){
-				basicdataGoodsAllocationEntity.setWarehouseId(nodeInfo.get(0));
-				basicdataGoodsAllocationEntity.setGoodsAreaId(nodeInfo.get(1));
-				basicdataGoodsAllocationEntity.setGoodsShelfId(nodeInfo.get(2));
-			}else {
-				return result;
-			}
 			 result = SqlHelper.retBool(goodsAllocationMapper.updateById(basicdataGoodsAllocationEntity));
-		}
 		return result;
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java

@@ -80,25 +80,15 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 	@Transactional(rollbackFor = Exception.class)
 	public boolean insertGoodsshelf(BasicdataGoodsShelfDTO basicdataGoodsShelfDTO) {
 		//维护仓库、货区数据
-		List<String> info = basicdataGoodsShelfDTO.getGoodsAreaInfo();
 		boolean result = false;
 		//这里新增货架必须有仓库和货区的信息
-		if (Func.isEmpty(info) ){
+		if (Func.isEmpty(basicdataGoodsShelfDTO) ){
 			return result;
-		}else {
+		}
 			BasicdataGoodsShelfEntity basicdataGoodsShelfEntity = new BasicdataGoodsShelfEntity();
 			BeanUtils.copyProperties(basicdataGoodsShelfDTO,basicdataGoodsShelfEntity);
-			if (info.size()==1){
-				basicdataGoodsShelfEntity.setWarehouseId(info.get(0));
-				basicdataGoodsShelfEntity.setGoodsAreaId(null);
-			}else if (info.size()==2){
-				basicdataGoodsShelfEntity.setWarehouseId(info.get(0));
-				basicdataGoodsShelfEntity.setGoodsAreaId(info.get(1));
-			}else {
-				return result;
-			}
+
 			BladeUser user = AuthUtil.getUser();
-			BeanUtils.copyProperties(basicdataGoodsShelfDTO,basicdataGoodsShelfEntity);
 			basicdataGoodsShelfEntity.setCreateTime(new Date());
 			basicdataGoodsShelfEntity.setCreateDept( Long.valueOf(user.getDeptId()));
 			basicdataGoodsShelfEntity.setCreateUser(user.getUserId());
@@ -114,32 +104,19 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 			//货架添加默认启用
 			basicdataGoodsShelfEntity.setEnableStatus(1);
 			result = SqlHelper.retBool(basicdataGoodsShelfMapper.insert(basicdataGoodsShelfEntity));
-		}
-
 		return result;
 	}
 
 	@Override
 	@Transactional
 	public boolean updateGoodsShelfInfo(BasicdataGoodsShelfDTO basicdataGoodsShelfDTO) {
-		List<String> goodsAreaInfo = basicdataGoodsShelfDTO.getGoodsAreaInfo();
 		boolean result = false;
-		if (Func.isEmpty(goodsAreaInfo) ){
+		if (Func.isEmpty(basicdataGoodsShelfDTO) ){
 			return result;
-		}else {
+		}
 			BasicdataGoodsShelfEntity basicdataGoodsShelfEntity = new BasicdataGoodsShelfEntity();
 			BeanUtils.copyProperties(basicdataGoodsShelfDTO,basicdataGoodsShelfEntity);
-			if (goodsAreaInfo.size()==1){
-				basicdataGoodsShelfEntity.setWarehouseId(goodsAreaInfo.get(0));
-				basicdataGoodsShelfEntity.setGoodsAreaId("");
-			}else if (goodsAreaInfo.size()==2){
-				basicdataGoodsShelfEntity.setWarehouseId(goodsAreaInfo.get(0));
-				basicdataGoodsShelfEntity.setGoodsAreaId(goodsAreaInfo.get(1));
-			}else {
-				return result;
-			}
 			result = SqlHelper.retBool(basicdataGoodsShelfMapper.updateById(basicdataGoodsShelfEntity));
-		}
 		return result;
 	}
 

doc/dpm/物流租户系统.pdma.json

@@ -33177,4 +33177,4 @@
     }
   ],
   "dbConn": []
-}
+}