Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Bills.java

@@ -2655,5 +2655,10 @@ public class Bills implements Serializable {
 	 */
 	@TableField(exist = false)
 	private String operatorEmail;
+	/**
+	 * 装货地点
+	 */
+	@TableField(exist = false)
+	private String placeofStuffing;
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -4588,6 +4588,9 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			throw new RuntimeException("缺少必要参数");
 		}
 		Bills detail = baseMapper.selectById(bills.getId());
+		if (detail == null) {
+			throw new RuntimeException("未查到客户订舱信息");
+		}
 		if (ObjectUtils.isNotNull(bills.getConfirmStatus()) && "1".equals(bills.getConfirmStatus())) {
 			if (!detail.getConfirmStatus().equals(bills.getConfirmStatus())) {
 				throw new RuntimeException("提单未确认");

blade-service/blade-los/src/main/java/org/springblade/los/excel/BoxAndLeadSealNoExcel.java

@@ -20,6 +20,9 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -96,5 +99,11 @@ public class BoxAndLeadSealNoExcel implements Serializable {
 	@ExcelProperty(value = "包装单位")
 	private String packingUnit;
 
+	/**
+	 * 唛头
+	 */
+	@ExcelProperty(value = "唛头")
+	private String marks;
+
 
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -4743,8 +4743,22 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			item.setUpdateTime(null);
 			item.setUpdateUser(0L);
 			item.setPid(0L);
-			item.setReturnsAmount(new BigDecimal("0.00"));
+			item.setInventoryHave(new BigDecimal("0"));
+			item.setInventoryFinancing(new BigDecimal("0"));
+			item.setProfitLossNum(new BigDecimal("0"));
+			item.setProfitLossAmount(new BigDecimal("0"));
 			item.setReturnsNumber(new BigDecimal("0"));
+			item.setReturnsAmount(new BigDecimal("0"));
+			item.setSendNum(new BigDecimal("0"));
+			item.setGoodsTotalShipAmount(new BigDecimal("0"));
+			item.setOutGoodsTotalShipNum(new BigDecimal("0"));
+			item.setOutGoodsTotalShipAmount(new BigDecimal("0"));
+			item.setPrimaryGoodsTotalNum(new BigDecimal("0"));
+			item.setPrimaryGoodsTotalAmount(new BigDecimal("0"));
+			item.setRedeemNum(new BigDecimal("0"));
+			item.setNextDayNum(new BigDecimal("0"));
+			item.setSendNumFinancing(new BigDecimal("0"));
+			item.setSendNumHave(new BigDecimal("0"));
 		}
 		order.setOrderItemsList(list);
 		return this.saveOrderMessage(order);