采购订单新建

src/main/java/com/dk/mdm/model/pojo/pur/Purchase.java

@@ -43,7 +43,7 @@ public class Purchase extends PageInfo<Purchase> implements Serializable {
     /**
      * 采购订单ID
      */
-    @TableId(value = "pur_id", type = IdType.AUTO)
+    //@TableId(value = "pur_id", type = IdType.AUTO)
     @ApiModelProperty(value = "采购订单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String purId;

src/main/java/com/dk/mdm/model/vo/pur/PurchaseVO.java

@@ -47,7 +47,7 @@ public class PurchaseVO extends PageInfo<PurchaseVO> implements Serializable {
     /**
      * 采购订单ID
      */
-    @TableId(value = "pur_id", type = IdType.AUTO)
+    //@TableId(value = "pur_id", type = IdType.AUTO)
     @ApiModelProperty(value = "采购订单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String purId;

src/main/java/com/dk/mdm/service/pur/PurchaseService.java

@@ -26,6 +26,7 @@ import com.dk.mdm.model.response.pur.PurchaseResponse;
 import com.dk.mdm.model.vo.mst.StaffVO;
 import com.dk.mdm.model.vo.pur.PurchaseItemVO;
 import com.dk.mdm.model.vo.pur.PurchaseVO;
+import com.dk.mdm.service.common.CommonService;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -63,6 +64,9 @@ public class PurchaseService extends BaseService<Purchase> {
 	@Autowired
 	private CommonMapper commonMapper;
 
+	@Autowired
+	private CommonService commonService;
+
 	/**
 	 * @desc   : 条件查询
 	 * @author : 常皓宁
@@ -99,16 +103,20 @@ public class PurchaseService extends BaseService<Purchase> {
 		//endregion
 
 		//region 设置采购订单总单信息并新建
-		purchasevo.setPurId(null);
+		// 制单时间
 		purchasevo.setMakeTime(LocalDateTime.now());
+		// 单据类型
 		purchasevo.setPurType(Constant.DocumentType.PUR_CHASE.getName());
+		// 入库状态
 		purchasevo.setIntoStatus(Constant.IntoStatus.DAIRUKU.getName());
+		// 订单状态
+		purchasevo.setPurStatus(Constant.Status.STATUS_DEAL.getName());
+		// 获取单号
+		Map<String , Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.PURCHASE.getName(),false);
+		purchasevo.setPurId(codeMap.get("outId").toString());
+		purchasevo.setPurNo(codeMap.get("outNote").toString());
 		Purchase purchase = purChaseConvert.convertToPo(purchasevo);
-		purchase.setPurNo("CS");//先随便塞个值 要不不能新建
 		purchaseMapper.insert(purchase);
-		purchasevo.setPurId(purchase.getPurId());
-		purchasevo.setPurNo(commonMapper.getDocNo(purchasevo.getCpId(),purchase.getPurId(),Constant.DocumentType.PUR_CHASE.getName()));
-		purchaseMapper.updatePurNO(purchasevo);
 		//endregion
 		//region 设置采购订单明细信息并新建
 		List<PurchaseItemVO> purchaseItemVOList = purchasevo.getPurchaseItemVOList().stream().filter(it -> it.getItemId() == null).collect(Collectors.toList());
@@ -117,8 +125,6 @@ public class PurchaseService extends BaseService<Purchase> {
 		for (PurchaseItemVO purchaseItemVO : purchaseItemVOList) {
 			PurchaseItem purchaseItem = purchaseItemConvert.convertToPo(purchaseItemVO);
 			purchaseItem.setPurId(purchase.getPurId());
-			purchaseItem.setIntoingQty(BigDecimal.ZERO);
-			purchaseItem.setIntoAmt(BigDecimal.ZERO);
 			num++;
 			purchaseItem.setItemIndex(num);
 			purchaseItem.setIntoStatus(Constant.IntoStatus.DAIRUKU.getName());