diff --git a/backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/datamodel/Contract.mk b/backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/datamodel/Contract.mk index 88d7c4b..df4d1b3 100644 --- a/backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/datamodel/Contract.mk +++ b/backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/datamodel/Contract.mk @@ -94,7 +94,7 @@ <annotation id='c7541b9d-4e81-4d58-8c37-f4c610cda822' attributeId='f154b68d-97da-4761-bc1f-3d17a99e6324' name='scale' value='4'></annotation> </attribute> <attribute id='0933ceb1-f327-4372-a316-cffa1c80991a' name='carInfo' columnName='car_info' title='车辆信息' type='string' default='' precision='' isArray='false'> - <annotation id='6f08f4ca-1f77-4ed4-a627-0fb8843959fa' attributeId='dfbeaa83-63dc-4638-b55a-8dda62d74dd4' name='length' value='300'></annotation> + <annotation id='6f08f4ca-1f77-4ed4-a627-0fb8843959fa' attributeId='dfbeaa83-63dc-4638-b55a-8dda62d74dd4' name='length' value='800'></annotation> </attribute> <attribute id='0933ceb1-f327-4372-a316-cffa1c80991a' name='memo' columnName='memo' title='备注' type='string' default='' precision='' isArray='false'> <annotation id='6f08f4ca-1f77-4ed4-a627-0fb8843959fa' attributeId='dfbeaa83-63dc-4638-b55a-8dda62d74dd4' name='length' value='500'></annotation> diff --git a/backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/datamodel/Contract.jmx b/backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/datamodel/Contract.jmx index 02d4e64..37fb51c 100644 --- a/backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/datamodel/Contract.jmx +++ b/backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/datamodel/Contract.jmx @@ -572,7 +572,7 @@ <m:annotations> <m:annotation> <m:type>bcp.type.constraint.StringLength</m:type> - <m:value>300</m:value> + <m:value>800</m:value> </m:annotation> <m:annotation> <m:type>javax.persistence.Column</m:type> diff --git a/backend/xyst.dinas.contract/src/main/resources/config/Contract.hbm.xml b/backend/xyst.dinas.contract/src/main/resources/config/Contract.hbm.xml index d1e00d9..2385910 100644 --- a/backend/xyst.dinas.contract/src/main/resources/config/Contract.hbm.xml +++ b/backend/xyst.dinas.contract/src/main/resources/config/Contract.hbm.xml @@ -106,7 +106,7 @@ <column name="dinas_amount" precision="12" scale="4"></column> </property> <property name="carInfo" type="nstring" not-null="false"> - <column name="car_info" length="300"></column> + <column name="car_info" length="800"></column> </property> <property name="memo" type="nstring" not-null="false"> <column name="memo" length="500"></column> diff --git a/backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesRecordServiceImpl.java b/backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesRecordServiceImpl.java index beb108d..6f22726 100644 --- a/backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesRecordServiceImpl.java +++ b/backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesRecordServiceImpl.java @@ -79,6 +79,7 @@ public class SalesRecordServiceImpl implements SalesRecordService { logger.info("开始同步地磅记录,传输参数为:"+ JsonUtil.beanToJson(salesRecordInfo)); HashMap<String, Object> returnMap = new HashMap<>(12); try { + BigDecimal advanceBalance1 = new BigDecimal(0); Date thentime = new Date(); // 获取砂石类型 KObject dinasType; @@ -183,9 +184,11 @@ public class SalesRecordServiceImpl implements SalesRecordService { returnMap.put("message", "余额不足:" + advanceBalance); return returnMap; } + advanceBalance1 = advanceBalance.subtract(salesRecord.getBigDecimal(SalesRecordConstant.DEALAMOUNT)); // 更新合同子表合同砂石余量(吨)-更新合同表付款余额、销售总量信息 contractService.modifyInventory(UUID.fromString(salesRecordInfo.getContractId()), UUID.fromString(salesRecordInfo.getDinasTypeId()), dealAmount, amount); + //添加预付款记录 } //根据销售类型判断修改需用计划还是临时销售计划 @@ -243,6 +246,8 @@ public class SalesRecordServiceImpl implements SalesRecordService { } returnMap.put("code", 200); returnMap.put("id", salesRecordId.toString()); + + returnMap.put("advanceBalance", advanceBalance1); returnMap.put("message", "新增成功"); return returnMap; diff --git a/backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/NeedPlan.mk b/backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/NeedPlan.mk index bb2203c..d48f523 100644 --- a/backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/NeedPlan.mk +++ b/backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/NeedPlan.mk @@ -56,7 +56,7 @@ </annotation> </attribute> <attribute id='2e29930f-7250-4714-b41c-5bd3ffee2c4e' name='transportLicensePlateNumber' columnName='transport_license_plate_number' title='运输车牌号' type='string' default='' precision='' isArray='false'> - <annotation id='14f073bb-ea3a-4ab3-971c-223040cbe678' attributeId='59d25e8c-9537-4c27-8846-8c58eedc098f' name='length' value='300'> + <annotation id='14f073bb-ea3a-4ab3-971c-223040cbe678' attributeId='59d25e8c-9537-4c27-8846-8c58eedc098f' name='length' value='800'> </annotation> </attribute> <attribute id='a52906e5-5b99-48c2-8b65-411f32ffa90f' name='needPlanTotalAmount' columnName='need_plan_total_amount' title='需用计划总量' type='fixnum' default='' precision='' isArray='false'> diff --git a/backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/SalesPlanTemp.mk b/backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/SalesPlanTemp.mk index d16391e..9a6ea68 100644 --- a/backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/SalesPlanTemp.mk +++ b/backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/SalesPlanTemp.mk @@ -37,7 +37,7 @@ <annotation id='e6ba6d4e-4430-45d5-9630-38e243786605' attributeId='2981edad-6163-4fac-9f51-d8aace3c9562' name='length' value='30'></annotation> </attribute> <attribute id='2e29930f-7250-4714-b41c-5bd3ffee2c4e' name='carNumber' columnName='car_number' title='车牌号' type='string' default='' precision='' isArray='false'> - <annotation id='14f073bb-ea3a-4ab3-971c-223040cbe678' attributeId='59d25e8c-9537-4c27-8846-8c58eedc098f' name='length' value='300'> + <annotation id='14f073bb-ea3a-4ab3-971c-223040cbe678' attributeId='59d25e8c-9537-4c27-8846-8c58eedc098f' name='length' value='800'> </annotation> </attribute> <attribute id='a52906e5-5b99-48c2-8b65-411f32ffa90f' name='totalPlanAmount' columnName='total_plan_amount' title='销售计划总量' type='fixnum' default='' precision='' isArray='false'> diff --git a/backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/NeedPlan.jmx b/backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/NeedPlan.jmx index ddda75b..141c15d 100644 --- a/backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/NeedPlan.jmx +++ b/backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/NeedPlan.jmx @@ -257,7 +257,7 @@ <m:annotations> <m:annotation> <m:type>bcp.type.constraint.StringLength</m:type> - <m:value>300</m:value> + <m:value>800</m:value> </m:annotation> <m:annotation> <m:type>javax.persistence.Column</m:type> diff --git a/backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/SalesPlanTemp.jmx b/backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/SalesPlanTemp.jmx index e291712..c345f3a 100644 --- a/backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/SalesPlanTemp.jmx +++ b/backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/SalesPlanTemp.jmx @@ -201,7 +201,7 @@ <m:annotations> <m:annotation> <m:type>bcp.type.constraint.StringLength</m:type> - <m:value>300</m:value> + <m:value>800</m:value> </m:annotation> <m:annotation> <m:type>javax.persistence.Column</m:type> diff --git a/backend/xyst.dinas.sales/src/main/resources/config/NeedPlan.hbm.xml b/backend/xyst.dinas.sales/src/main/resources/config/NeedPlan.hbm.xml index 6ea2dd1..77d62ab 100644 --- a/backend/xyst.dinas.sales/src/main/resources/config/NeedPlan.hbm.xml +++ b/backend/xyst.dinas.sales/src/main/resources/config/NeedPlan.hbm.xml @@ -64,7 +64,7 @@ <column name="submit_state" length="100"></column> </property> <property name="transportLicensePlateNumber" type="nstring" not-null="false"> - <column name="transport_license_plate_number" length="100"></column> + <column name="transport_license_plate_number" length="300"></column> </property> <property name="needPlanTotalAmount" type="big_decimal" not-null="false"> <column name="need_plan_total_amount" precision="12" scale="4"></column> diff --git a/backend/xyst.dinas.sales/src/main/resources/config/SalesPlanTemp.hbm.xml b/backend/xyst.dinas.sales/src/main/resources/config/SalesPlanTemp.hbm.xml index 210c72e..0af36e4 100644 --- a/backend/xyst.dinas.sales/src/main/resources/config/SalesPlanTemp.hbm.xml +++ b/backend/xyst.dinas.sales/src/main/resources/config/SalesPlanTemp.hbm.xml @@ -66,7 +66,7 @@ <column name="transport_mode" length="30"></column> </property> <property name="carNumber" type="nstring" not-null="false"> - <column name="car_number" length="100"></column> + <column name="car_number" length="800"></column> </property> <property name="totalPlanAmount" type="big_decimal" not-null="false"> <column name="total_plan_amount" precision="12" scale="4"></column> diff --git a/backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/web/WeighbridgeSyncController.java b/backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/web/WeighbridgeSyncController.java index 145ecaf..ae926f0 100644 --- a/backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/web/WeighbridgeSyncController.java +++ b/backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/web/WeighbridgeSyncController.java @@ -8,7 +8,6 @@ import com.beecode.bap.attachment.service.AttachmentService; import com.beecode.bcp.type.KObject; import com.beecode.inz.basis.team.pojo.ResponseObj; import com.xyst.dinas.biz.service.StationService; -import com.xyst.dinas.sales.entity.StationDinasTypeRelation; import com.xyst.dinas.sales.service.InventoryService; import com.xyst.dinas.sales.service.SalesPlanService; import com.xyst.dinas.sales.service.SalesRecordService;