修改订单状态

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

@@ -401,6 +401,7 @@
         ldsa.create_time,
         ldsa.update_user,
         ldsa.update_time,
+        ldsa.incoming_num AS  incomingNum,
         ldsa.status, ldsa.is_deleted, ldsa.create_dept,
         ldsa.reserve1, ldsa.reserve2, ldsa.reserve3, ldsa.reserve4, ldsa.reserve5,
         ldsa.service_number, ldsa.order_code,
@@ -571,12 +572,14 @@
         ldsa.create_time,
         ldsa.update_user,
         ldsa.update_time,
+        (ldsa.incoming_num - oun.num) AS handQuantity,
         ldsa.status, ldsa.is_deleted, ldsa.create_dept,
         ldsa.reserve1, ldsa.reserve2, ldsa.reserve3, ldsa.reserve4, ldsa.reserve5,
         ldsa.service_number, ldsa.order_code,
         ldsa.mall_id, ldsa.mall_code, ldsa.mall_name, ldsa.store_name,
         ldsa.store_code, ldsa.store_id, ldsa.description_goods, ldsa.warehouse_id,
-        ldsa.warehouse, ldsa.warehouse_entry_time, ldsa.store_time, ldsa.total_number, ldsa.hand_quantity,
+<!--        &#45;&#45; ldsa.hand_quantity,-->
+        ldsa.warehouse, ldsa.warehouse_entry_time, ldsa.store_time, ldsa.total_number,
         ldsa.complete_set, ldsa.brand, ldsa.type_service, ldsa.customer_name, ldsa.customer_telephone,
         ldsa.customer_address, ldsa.genre,
         ldsa.stockup_status, ldsa.reservation_status, ldsa.order_status, ldsa.grounding_status,
@@ -607,8 +610,9 @@
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
+        LEFT JOIN order_use_num AS oun ON ldsa.id = oun.stock_article_id
         <where>
-            ldsa.order_status in ('10','20','30','70') and ldsa.reservation_status in ('10','20')
+            ldsa.order_status in ('10','20','30','70') and ldsa.reservation_status in ('10','20') AND (ldsa.incoming_num - oun.num) > 0
             <if test="par.warehouseId != null and par.warehouseId != '' ">
                 and ldsa.warehouse_id = #{par.warehouseId}
             </if>

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

@@ -6531,7 +6531,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 		int loadingNum = 0;
 		int signingNum = 0;
-		int deliveryQuantity = deliveryListEntity.getDeliveryNumber() + deliveryListEntity.getInventoryNub();
+		int deliveryQuantity = deliveryListEntity.getDeliveryNumber() + (Objects.isNull(deliveryListEntity.getInventoryNub())?0:deliveryListEntity.getInventoryNub());
 		if (Func.isNotEmpty(deliveryLoadingNum)){
 			loadingNum += deliveryLoadingNum.getInventoryLoadingQuantity() + deliveryLoadingNum.getPackageLoadingQuantity();
 		}

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

@@ -789,7 +789,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	@Transactional
 	public R signfor(DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
 
-		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 //		---------------------------------2023-09-09 包件签收调整---------------------------------------------------------------
 
 		//思路：              在于一个客户下不会出现重复的包条码
@@ -1559,7 +1559,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	@Override
 	@Transactional
 	public R signforIn(DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
-		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 //		//查询该物品是否有所装车
 //		List<DistributionLoadscanEntity> distributionLoadscanEntities = distributionLoadscanMapper.selectList(new QueryWrapper<DistributionLoadscanEntity>().lambda()
 //			.ne(DistributionLoadscanEntity::getScanStatus, 1)
@@ -2234,7 +2234,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			distributionDeliverySelfEntity = Func.copy(distributionDeliveryTripartiteEntity, DistributionDeliverySelfEntity.class);
 //			BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity);
 		}
-		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
 
 		if (Func.equals(distributionSignforEntity.getDriverSigning(), SignforDriverSigningStatusConstant.yiqianshou.getValue())) {