Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND into feature_mps_2

utils/k3cloud/service/PLN_PLANORDER.go

@@ -112,7 +112,7 @@ func (_this *PLN_PLANORDER_Service) Save(PlantNr int, UserId string, articleDema
 			FMaterialID: _struct.FNumber{
 				FNumber: article.ArtId,
 			},
-			FReleaseType: "1",
+			FReleaseType: "",
 			FSupplyMaterialID: _struct.FNumber{
 				FNumber: article.ArtId,
 			},

utils/k3cloud/service/SAL_XORDER.go

@@ -16,7 +16,7 @@ func SAL_XORDERInit_Dingdanxuqiu() *SAL_XORDERService {
 	cust := &SAL_XORDERService{
 		K3config:   utils.K3Obj,
 		FormID:     "SAL_XORDER",
-		FieldKeys:  "FMaterialId.FNumber,FDeliRemainQty,FPlanDate,FBillNo,FChangeType,FCloseStatus,FMrpCloseStatus",
+		FieldKeys:  "FMaterialId.FNumber,FRemainOutQty,FPlanDate,FBillNo,FChangeType,FCloseStatus,FMrpCloseStatus",
 		FUseOrgKey: "FStockOrgId=" + utils.K3Obj.FUseOrgId + " or FStockOrgId = " + utils.K3Obj.FUseOrgId2,
 	}
 	return cust

utils/k3cloud/service/sal_saleorder.go

@@ -26,7 +26,7 @@ func SaleOrderInit_Dingdanxuqiu() *SaleOrderService {
 	cust := &SaleOrderService{
 		K3config:   utils.K3Obj,
 		FormID:     "SAL_SaleOrder",
-		FieldKeys:  "FMaterialId.FNumber,FDeliRemainQty,FDeliveryDate,FBillNo,FBusinessType,FQty,FTransJoinQty,FRowId",
+		FieldKeys:  "FMaterialId.FNumber,FRemainOutQty,FDeliveryDate,FBillNo,FBusinessType,FQty,FTransJoinQty,FRowId",
 		FUseOrgKey: "(FStockOrgId=" + utils.K3Obj.FUseOrgId + " or FStockOrgId =  " + utils.K3Obj.FUseOrgId2 + ")",
 	}
 	return cust