修改自提数据回显

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

@@ -25,6 +25,7 @@ public class DictBizConstant {
 	public static final String ORDER_PACKAGE_GROUNDING_STATUS = "order_package_grounding_status";//包间上架状态
 	public static final String ORDER_PACKAGE_RESERVATION_STATUS = "order_package_reservation_status";//包件预约状态
 	public static final String STOCK_ALLOCATION = "stock_assign_status";//包间上架状态
+	public static final String LOGPM_UNIT = "logpm_unit";//包间上架状态
 
 
 

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

@@ -90,6 +90,8 @@ public class DistrilbutionBillLadingAppVO extends DistrilbutionBillLadingEntity
 	private Integer deliveryNum;//备货数量
 	@ApiModelProperty(value = "以扫备货数量")
 	private Integer esauInventoryNum;//以扫备货数量
+	@ApiModelProperty(value = "包装规格")
+	private Integer packingSpecification;//包装规格
 
 
 	private List<DistrilbutionAppBillLadingDetailVO> list = new ArrayList<>();

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

@@ -27,11 +27,13 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.cache.DictBizCache;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -139,7 +141,7 @@ public class DistributionParcelListController extends BladeController  {
 			if(ObjectUtils.isNotNull(materialOwnId)){
 				distributionParcelListDTO.setMaterialCode(materialOwnId.getProductCode());
 				distributionParcelListDTO.setMaterialName(materialOwnId.getName());
-				distributionParcelListDTO.setMaterialUnit(materialOwnId.getLogpmUnit());
+				distributionParcelListDTO.setMaterialUnit(DictBizCache.getValue(DictBizConstant.LOGPM_UNIT,materialOwnId.getLogpmUnit()));
 				distributionParcelListDTO.setSku(materialOwnId.getSku());
 			}else{
 				return R.fail("操作失败！！");

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

@@ -178,10 +178,11 @@
             select count(1)
             from logpm_distribution_stock lds
             where lds.bill_lading_id = #{param.id} and lds.is_deleted = 0
-        ) deliveryNum
+        ) deliveryNum ,lbm.packing_specification packingSpecification
         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
+                 LEFT JOIN logpm_basicdata_material lbm on lbm.id = ldsl.material_id
         <where>
             ldbl.id  = #{param.id} and lddd.is_deleted = '0'
         </where>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -314,6 +314,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		distributionStockListEntity.setStorageLocation(Optional.ofNullable(distributionParcelList.getGoodsAllocation()).orElse(null)); //库位信息
 		distributionStockListEntity.setMallName(Optional.ofNullable(distributionStockArticleEntity.getMallName()).orElse(null)); //商场名称
 		distributionStockListEntity.setQuantityStock(Optional.ofNullable(distributionStockArticleEntity.getHandQuantity()).orElse(null)); //库存数量
+		distributionStockListEntity.setIncomingBatch(Optional.ofNullable(distributionStockArticleEntity.getWaybillNumber()).orElse(null)); //入库批次
 		distributionStockListEntity.setOutboundQuantity(0); //出库数量
 		distributionStockListEntity.setDespatch(Optional.ofNullable(distributionStockArticleEntity.getTrainNumber()).orElse(null));//车次号
 //		distributionStockListEntity.setCargoUnit(Optional.ofNullable(distributionParcelList.getMaterialUnit()).orElse(null));//单位

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -883,7 +883,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				i.setList(ladingDetailVOS);
 			}else{
 				//没有备货完成
-				i.setEsauInventoryNum(0);
+				i.setEsauInventoryNum(-1);
 			}
 		});
 		return inventory;