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

src/main/java/com/baosight/hggp/hg/sc/domain/HGSC004B.java

@@ -115,7 +115,7 @@ public class HGSC004B extends DaoEPBase {
 	private BigDecimal thick = new BigDecimal("0");		/* 厚*/
 	private Integer productStatus = new Integer(0);		/* 产品状态 0:未提交，1:已提交*/
 	private Integer changeType = new Integer(0);		/* 变更类型:默认0,1:增加，2:替换，3:删除*/
-	private Integer quantity = new Integer(0);		/* 数量*/
+	private BigDecimal quantity = new BigDecimal(0);		/* 数量*/
 	private BigDecimal singleWeight = new BigDecimal(0.000);		/* 单重*/
 	private BigDecimal totalWeight = new BigDecimal(0.000);		/* 总重*/
 	private Integer approvalStatus = new Integer(0);		/* 审批状态\t0:待审；1:审核中；2:已审*/
@@ -259,7 +259,7 @@ public class HGSC004B extends DaoEPBase {
 		eiColumn = new EiColumn(FIELD_quantity);
 		eiColumn.setType("N");
 		eiColumn.setScaleLength(0);
-		eiColumn.setFieldLength(8);
+		eiColumn.setFieldLength(20);
 		eiColumn.setDescName("数量");
 		eiMetadata.addMeta(eiColumn);
 
@@ -573,7 +573,7 @@ public class HGSC004B extends DaoEPBase {
 	 * get the quantity - 数量.
 	 * @return the quantity
 	 */
-	public Integer getQuantity() {
+	public BigDecimal getQuantity() {
 		return this.quantity;
 	}
 
@@ -582,7 +582,7 @@ public class HGSC004B extends DaoEPBase {
 	 *
 	 * @param quantity - 数量
 	 */
-	public void setQuantity(Integer quantity) {
+	public void setQuantity(BigDecimal quantity) {
 		this.quantity = quantity;
 	}
 	/**
@@ -820,7 +820,7 @@ public class HGSC004B extends DaoEPBase {
 		setInventType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_invent_type)), inventType));
 		setProductStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_product_status)), productStatus));
 		setChangeType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_change_type)), changeType));
-		setQuantity(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_quantity)), quantity));
+		setQuantity(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_quantity)), quantity));
 		setSingleWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_single_weight)), singleWeight));
 		setTotalWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_total_weight)), totalWeight));
 		setApprovalStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_approval_status)), approvalStatus));

src/main/java/com/baosight/hggp/hg/sc/tools/HGSCTools.java

@@ -337,7 +337,7 @@ public class HGSCTools {
                     hgsc004a.setMaterialId(results.get(0).getId());
                     checkSaveData(hgsc004a);
                 }else if (hgsc004a.getLv()==4){
-                    if (hgsc004a.getParentProdCode().length()==0){
+                    if (hgsc004a.getParentProdCode().trim().length()==0){
                         AssertUtils.isTrue(true, "层级为4级，父节点-产品编号不能为空！");
                     }
                     Map<String,Object> paramMap = new HashMap<>();
@@ -1340,7 +1340,7 @@ public class HGSCTools {
     }
 
     public static class THGSC009{
-           /* public static void generatorOrder(List<HGSC005> hgsc005List, List<HGSC005A> hgsc005AList){
+        /* public static void generatorOrder(List<HGSC005> hgsc005List, List<HGSC005A> hgsc005AList){
                 Map<String, Optional<HGSC005>> hgsc005Map = hgsc005List.stream().collect(Collectors.groupingBy(HGSC005::getPlanCode,Collectors.maxBy(
                         Comparator.comparingLong(HGSC005::getId))));
                 Map<String,List<HGSC005A>> hgsc005aMap = hgsc005AList.stream().collect(Collectors.groupingBy(HGSC005A::getPlanCode));
@@ -1351,9 +1351,9 @@ public class HGSCTools {
                     DaoUtils.insert(HGSC006.INSERT,hgsc006);
                     DaoUtils.insert(HGSC006A.INSERT,hgsc006AList);
                 });
-            }*/
+        }*/
 
-            /*public static HGSC006 constructObj(HGSC005 hgsc005){
+        /*public static HGSC006 constructObj(HGSC005 hgsc005){
                 HGSC006 hgsc006 = new HGSC006();
                 hgsc006.setOrderCode(SequenceGenerator.getNextSequence(HGConstant.SequenceId.HGSC006_ORDER_CODE));
                 hgsc006.setMatId(hgsc005.getMatId());
@@ -1364,7 +1364,7 @@ public class HGSCTools {
                 hgsc006.setProjName(hgsc005.getProjName());
                 hgsc006.setAssignStatus(UNASSIGN.getCode());
                 return hgsc006;
-            }*/
+        }*/
         public static HGSC009 getById(Long taskId){
             AssertUtils.isTrue(Objects.isNull(taskId)||taskId<=0, "材料计划ID不能为空！");
             HGSC009 results = (HGSC009)DaoBase.getInstance().get(HGSC009.QUERY, HGSC009.FIELD_ID, taskId);
@@ -1411,13 +1411,14 @@ public class HGSCTools {
             for (HGSC009 hgsc009:hgsc009List) {
                 HGSC001 hgsc001 = Hgsc001.queryByCode(hgsc009.getProjCode());
                 AssertUtils.isNull(hgsc001,"项目不存在，添加失败！");
-                HGSC009 sc009 = queryByCode(hgsc009.getProjCode());
-                AssertUtils.isNotNull(sc009,"材料计划项目已添加，添加失败！");
+                //HGSC009 sc009 = queryByCode(hgsc009.getProjCode());
+                //AssertUtils.isNotNull(sc009,"材料计划项目已添加，添加失败！");
                 if (hgsc001.getCompanyCode() != null) {
                     hgsc009.setCompanyCode(hgsc001.getCompanyCode());
+                    hgsc009.setCompanyName(hgsc001.getCompanyName());
+                    hgsc009.setProjName(hgsc001.getProjName());
                 }
-                hgsc009.setCompanyName(hgsc001.getCompanyName());
-                hgsc009.setProjName(hgsc001.getProjName());
+
                 hgsc009.setPlanMaterialCode(SequenceGenerator.getNextSequence(HGConstant.SequenceId.PLAN_MATERIAL_CODE));
                 DaoUtils.insert(HGSC009.INSERT,hgsc009);
                 for (HGSC009A hgsc009a: hgsc009aList) {