2024年4月22日17:39:58

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsAttn.java

@@ -84,7 +84,6 @@ public class PjCorpsAttn implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjShipItems.java

@@ -94,7 +94,6 @@ public class PjShipItems implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 备注

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/controller/ShipController.java

@@ -52,6 +52,8 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -447,6 +449,7 @@ public class ShipController extends BladeController {
 		if (!pagesOrder.isEmpty()) {
 			pages.addAll(pagesOrder);
 		}
+		pages.sort(Comparator.comparing(PjShipStockDetails::getUpdateTime).reversed());
 		return R.data(pages);
 	}
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -1072,7 +1072,11 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 
 				PjOrderItems orderItems = pjOrderItems.stream().filter(e -> e.getId().equals(item.getSrcItemId())).findFirst().orElse(null);
 				if (orderItems != null) {
-					orderItems.setSendNum(orderItems.getSendNum().add(item.getSendNum()));
+					if(ship.getBillno().contains("TK")){
+						orderItems.setSendNum(orderItems.getSendNum().subtract(item.getSendNum()));
+					}else{
+						orderItems.setSendNum(orderItems.getSendNum().add(item.getSendNum()));
+					}
 					pjOrderItemsList.add(orderItems);
 				} else {
 					throw new RuntimeException("数据异常请联系管理员");
@@ -1578,7 +1582,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					}
 				}*/
 				PjProductLaunch pjProductLaunches = productLaunch.stream()
-					.filter(i -> i.getGoodsId().equals(item.getId())).findFirst().orElse(null);
+					.filter(i -> i.getGoodsId().equals(item.getGoodsId())).findFirst().orElse(null);
 				//修改上架数量
 				if (pjProductLaunches != null) {
 					pjProductLaunches.setInventory(pjProductLaunches.getInventory().subtract(item.getSendNum()));