Browse Source

销售订单单证 同步多账套id重复

liuchaohui 2 years ago
parent
commit
e08bcfdaca

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderDataItem.java

@@ -95,7 +95,7 @@ public class SyOrderDataItem {
 	/**光坯毛门幅CM*/
 	@Excel(name = "光坯毛门幅CM", width = 15)
     @ApiModelProperty(value = "光坯毛门幅CM")
-	private java.math.BigDecimal guangpeiGateWidth;
+	private java.lang.String guangpeiGateWidth;
 	/**箱数*/
 	@Excel(name = "箱数", width = 15)
     @ApiModelProperty(value = "箱数")

+ 3 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/impl/SyOrderDataServiceImpl.java

@@ -162,7 +162,7 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
 //                    cbdefine2 = "oe.cbdefine2";
 //                }
                 String sql = "SELECT " +
-                        "s.AutoID AS id"+sy.getAccount()+"," +
+                        "s.AutoID AS id," +
                         "s.ID AS syOrderDataId," +
                         "s.cDefine22 AS itemNumber," +
                         "s.dPreDate AS preDeliveryDate," +
@@ -221,9 +221,11 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                 List<JSONObject> jianSon = JsonChangeUtils.toJSONObject(listSon);
                 for (JSONObject Object:jianSon) {
                     SyOrderDataItem sy2 = JSONObject.toJavaObject(Object, SyOrderDataItem.class);
+                    sy2.setId(sy.getAccount()+sy2.getId());
                     syOrderDataItemService.save(sy2);
                 }
                 //添加主表数据进入数据库
+                sy.setId(sy.getAccount()+sy.getId());
                 save(sy);
             }
             dxpDataPlanService.updateLastTime(day,"senYu_syOrder");