修改包件状态

blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java

@@ -20,6 +20,8 @@ public class DictBizConstant {
 
 	public static final String ORDER_PACKAGE_STATUS = "order_package_status";//配送包件状态
 	public static final String ORDER_PACKAGE_FREEZE_STATUS = "order_package_freeze_status";//包间冻结状态
+	public static final String ORDER_PACKAGE_STOCKUP_STATUS = "order_package_stockup_status";//包间备货状态
+	public static final String ORDER_PACKAGE_GROUNDING_STATUS = "order_package_grounding_status";//包间上架状态
 
 
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java

@@ -189,6 +189,12 @@ public class DistributionParcelListEntity extends TenantEntity {
 	private String orderPackageFreezeStatus;
 
 
+	@ApiModelProperty(value = "备货状态")
+	private String orderPackageStockupStatus;
+	@ApiModelProperty(value = "上架状态")
+	private String orderPackageGroundingStatus;
+
+
 
 
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java

@@ -125,6 +125,11 @@ public class DistributionStockListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "入库时间")
 	private Date warehousingTime;
+	/**
+	 * 上架时间
+	 */
+	@ApiModelProperty(value = "上架时间")
+	private Date groundingTime;
 	/**
 	 * 拆包数
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java

@@ -48,6 +48,14 @@ public class DistributionParcelListVO extends DistributionParcelListEntity {
 	 * 包件冻结状态
 	 */
 	private String orderPackageFreezeStatusName;
+	/**
+	 * 包件上架状态
+	 */
+	private String orderPackageGroundingStatusName;
+	/**
+	 * 包件备货状态
+	 */
+	private String orderPackageStockupStatusName;
 
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java

@@ -77,11 +77,7 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity {
 
 	@ApiModelProperty(value = "冻结状态名称")
 	private String freezeStatusName;
-	/**
-	 * 上架状态
-	 */
-	@ApiModelProperty(value = "上架状态名称")
-	private String groundingStatus;
+
 
 	@ApiModelProperty(value = "订单状态名称")
 	private String orderStatusName;

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingAppVO.java

@@ -18,6 +18,8 @@ package com.logpm.distribution.vo;
 
 import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
 import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingDetailVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -33,6 +35,7 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value="自提实体", description="自提实体")
 public class DistrilbutionBillLadingAppVO extends DistrilbutionBillLadingEntity {
 	private static final long serialVersionUID = 1L;
 
@@ -42,33 +45,46 @@ public class DistrilbutionBillLadingAppVO extends DistrilbutionBillLadingEntity
 
 	private Integer carType;
 	private String carTypeStr;
-
+	@ApiModelProperty(value = "提货状态")
 	private String condition;//提货状态
+	@ApiModelProperty(value = "提货状态")
 	private String conditionStr;//提货状态
-
+	@ApiModelProperty(value = "车牌号")
 	private String pickUpPlate;//车牌号
-
+	@ApiModelProperty(value = "提货人")
 	private String consignee;//提货人
-
+	@ApiModelProperty(value = "备货状态")
 	private String stockupStatus;//备货状态
+//	@ApiModelProperty(value = "分类")
 	private String stockupStatusStr;
-
+	@ApiModelProperty(value = "制单时间")
 	private Date createTime;//制单时间
+	@ApiModelProperty(value = "提货时间")
 	private Date pickUpTime;//提货时间
 
-
+	@ApiModelProperty(value = "订单总数")
 	private Integer orderNum;//订单总数
+	@ApiModelProperty(value = "自提件数")
 	private Integer planNum;//自提件数
+	@ApiModelProperty(value = "签收总数")
 	private Integer signedNum;//签收总数
+	@ApiModelProperty(value = "签收总数")
 	private Integer inventoryNum;//签收总数
-
+	@ApiModelProperty(value = "齐套总数")
 	private Integer completeNum;//齐套总数
+	@ApiModelProperty(value = "库存品id")
 	private String stockListId;//库存品id
+	@ApiModelProperty(value = "库存数量")
 	private Integer quantity;//库存数量
+	@ApiModelProperty(value = "物品名称")
 	private String descriptionGoods;//物品名称
+	@ApiModelProperty(value = "单位")
 	private String cargoUnit;//单位
+	@ApiModelProperty(value = "sku")
 	private String sku;//sku
+	@ApiModelProperty(value = "备货数量")
 	private Integer deliveryNum;//备货数量
+	@ApiModelProperty(value = "以扫备货数量")
 	private Integer esauInventoryNum;//以扫备货数量
 
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java

@@ -23,6 +23,8 @@ import com.logpm.distribution.service.IDistrilbutionBillLadingService;
 import com.logpm.distribution.vo.DistrilbutionBillLadingAppVO;
 import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingOrderMainVO;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
@@ -92,6 +94,7 @@ public class DistributionBillLadingAppController extends BladeController {
 	@ApiOperation(value = "自提订单列表库存品",notes = "自提订单列表库存品")
 	@GetMapping("/getInventory")
 	@ApiOperationSupport(order = 1)
+	@ApiImplicitParam(name = "id",value ="自提单ID")
 	public R<IPage<DistrilbutionBillLadingAppVO>> getInventory(@ApiIgnore @RequestParam Map<String, Object> distrilbutionBillLading, Query query){
 		IPage<DistrilbutionBillLadingAppVO> ladingAppVOIPage = distrilbutionBillLadingService.getInventory(Condition.getPage(query),distrilbutionBillLading);
 		return R.data(ladingAppVOIPage);
@@ -100,13 +103,19 @@ public class DistributionBillLadingAppController extends BladeController {
 	@ApiOperation(value = "自提订单列表库存品详细包件",notes = "自提订单列表库存品详细包件")
 	@GetMapping("/getInventoryNum")
 	@ApiOperationSupport(order = 1)
+	@ApiImplicitParam(name = "id",value ="自提单ID")
 	public R<IPage<DistrilbutionBillLadingAppVO>> getInventoryNum(@ApiIgnore @RequestParam Map<String, Object> distrilbutionBillLading, Query query){
 		IPage<DistrilbutionBillLadingAppVO> ladingAppVOIPage = distrilbutionBillLadingService.getInventoryNum(Condition.getPage(query),distrilbutionBillLading);
 		return R.data(ladingAppVOIPage);
 	}
 
-	@ApiOperation(value = "扫描id")
+	@ApiOperation(value = "自提扫描id")
 	@PutMapping("/scan")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "自提单ID", required = true),
+		@ApiImplicitParam(name = "coding", value = "包条码", required = true),
+		@ApiImplicitParam(name = "type", value = "类型 4 订单  3 库存品", required = true)
+	})
 	public R getScan(@ApiIgnore @RequestParam Map<String, Object> distrilbutionBillLading){
 		R scan = distrilbutionBillLadingService.getScan(distrilbutionBillLading);
 		return scan;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java

@@ -29,6 +29,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -86,8 +87,11 @@ public class DistributionStockupController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入distributionStockup")
 	public R<IPage<DistributionStockupVO>> detailReservationOwn(@ApiIgnore @RequestParam Map<String, Object> distributionStockup, Query query) {
 		Object o = distributionStockup.get("id");
-		IPage<DistributionStockupVO> detail = distributionStockupService.detailReservationOwn(Condition.getPage(query),Long.parseLong((String) o));
-		return R.data(detail);
+		if(ObjectUtil.isNotEmpty(o)){
+			IPage<DistributionStockupVO> detail = distributionStockupService.detailReservationOwn(Condition.getPage(query),Long.parseLong((String) o));
+			return R.data(detail);
+		}
+		return R.data(null);
 	}
 
 	/**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -48,6 +48,7 @@
                  LEFT JOIN logpm_warehouse_goods_area lwga ON lds.stockup_area = lwga.id
                  LEFT JOIN logpm_basicdata_team_group btg ON lds.loader_id = btg.id
         <where>
+           lds.is_deleted = 0
            <!-- lds.tenant_id = #{param.tenantId} -->
             <if test="param.typeService != null and param.typeService != '' "> and lds.type_service = #{param.typeService}</if>
             <if test="param.stockupDate != null  "> and  TO_DAYS(lds.stockup_date)=TO_DAYS( #{param.stockupDate})</if>
@@ -181,6 +182,7 @@
          ldr.id in (select  reservation_id
                          from logpm_distribution_stockup_info )
           and ldsi.stockup_id = #{id}
+            and ldr.is_deleted = 0
         </where>
     </select>
 
@@ -204,12 +206,13 @@
                   LEFT JOIN  logpm_distribution_stockup lds on lds.id = ldsi.stockup_id
         <where>
             ldsi.stockup_id = #{ id }
+            and ldsi.is_deleted = 0
         </where>
 
     </select>
 
     <select id="getInventoryOwn" resultType="com.logpm.distribution.vo.DistributionStockupVO">
-        select DISTINCT ldsii.sku ,ldsii.order_self_numbering orderSelfNumbering,ldsii.description_goods descriptionGoods,ldsii.cargo_unit cargoUnit,
+        select DISTINCT ldsii.sku ,ldsii.order_code orderCode,ldsii.description_goods descriptionGoods,ldsii.cargo_unit cargoUnit,
                ldrsi.reservation_num reservationNum,ldpl.pallet ,lds.stockup_area stockupArea,
                lds.stockup_status stockupStatus,lds.stockup_date stockupDate,ldpl.goods_allocation goodsAllocation,
         (

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml

@@ -182,7 +182,9 @@
         from logpm_distrilbution_bill_lading ldbl
                  LEFT JOIN logpm_distribution_delivery_details lddd on ldbl.id = lddd.bill_lading_id
                  LEFT JOIN logpm_distribution_stock_list ldsl on ldsl.id = lddd.stock_list_id
-        where ldbl.id  = #{param.id} and lddd.is_deleted = '0'
+        <where>
+            ldbl.id  = #{param.id} and lddd.is_deleted = '0'
+        </where>
     </select>
 
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java

@@ -28,6 +28,9 @@ public class DistributionParcelListWrapper extends BaseEntityWrapper<Distributio
 
 		parcelListVO.setOrderPackageStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STATUS, entity.getOrderPackageStatus()));
 		parcelListVO.setOrderPackageFreezeStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, entity.getOrderPackageFreezeStatus()));
+		parcelListVO.setOrderPackageGroundingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_GROUNDING_STATUS, entity.getOrderPackageGroundingStatus()));
+		parcelListVO.setOrderPackageStockupStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STOCKUP_STATUS, entity.getOrderPackageStockupStatus()));
+
 		return parcelListVO;
 	}
 }