From ec6efa5312240892d38bf790e7b65b665f879663 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 3 Jan 2024 11:24:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionSignforServiceImpl.java     |  5 +++--
 .../impl/WarehouseUpdownTypeServiceImpl.java     | 16 +---------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 3d49d63fd..27b99374c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -72,6 +72,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.system.cache.DictBizCache;
@@ -2254,7 +2255,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:SSS");
 
 
 		if (Func.equals(distributionSignforEntity.getDriverSigning(), SignforDriverSigningStatusConstant.yiqianshou.getValue())) {
@@ -2361,7 +2362,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					}
 				}
 			} else {
-				log.error("################库存品未进行备货操作+{}" + detailEntities);
+				log.error("################库存品未进行备货操作+{}" , detailEntities);
 				return R.fail("库存品未进行备货操作");
 			}
 		}
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
index c8f2b07fd..856fff21b 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
@@ -2717,21 +2717,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 
 		distributionParcelListClient.updatePackageGroundingStatus(orderPackageCode,groundingStatus,warehouseId);
 
-//		DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId);
-//		String orderCode = parcelListEntity.getOrderCode();
-//		List<DistributionParcelListEntity> listEntities = distributionParcelListClient.findEntityListByOrderCode(orderCode,warehouseId);
-//		List<DistributionParcelListEntity> list = distributionParcelListClient.getListByOrderCodeAndgroundingStatus(orderCode,"10",warehouseId);
-//		int size = list.size();
-//		if(size == 0){
-//			//订单下所有包件已经上架，就修改订单状态为已上架30
-//			distributionStockArticleClient.updateGroundingStatus(orderCode,"30",warehouseId);
-//		}else if(size < listEntities.size()){
-//			//部分上架20
-//			distributionStockArticleClient.updateGroundingStatus(orderCode,"20",warehouseId);
-//		}else if(size  == listEntities.size()){
-//			//已下架40
-//			distributionStockArticleClient.updateGroundingStatus(orderCode,"40",warehouseId);
-//		}
+
 	}