Commit a818560b by 王衍超

增加临时销售计划;审批接口;

parent 770772bc
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>f764ab20-9559-4f85-be40-811f356edce0</id>
<id>98892d1b-a01a-43ac-894e-ba5f3fa30179</id>
<name>com.xyst.dinas.biz.bill.Organization$sequence</name>
<title>组织机构$sequence</title>
<description>组织机构</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>9ba3b6de-5493-4b82-8826-58d125777daf</id>
<id>5e70b8f1-4bc2-40af-887c-90824bcdb76e</id>
<name>com.xyst.dinas.biz.bill.Organization$serial</name>
<title>组织机构$serial</title>
<description>组织机构</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>e3c6dde4-16f1-4ee8-9214-f829abead289</id>
<id>ccadaa8a-e128-42c6-8ff6-411866da4e7b</id>
<name>com.xyst.dinas.biz.bill.Organization</name>
<title>组织机构</title>
<description>组织机构</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>c30fe692-436e-4d6b-848b-8eea61261ac7</id>
<id>af14bc9b-b184-40bf-be76-c440dfcd4b23</id>
<name>com.xyst.dinas.biz.bill.Position$sequence</name>
<title>岗位$sequence</title>
<description>岗位</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>b50e3a87-2791-42d0-8df3-cdb81a13b15b</id>
<id>90b09720-b7aa-49db-8731-58c440ea0c0e</id>
<name>com.xyst.dinas.biz.bill.Position$serial</name>
<title>岗位$serial</title>
<description>岗位</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>a29a2f95-a4bf-41cc-8940-323d19a21a06</id>
<id>20b47dd4-74b3-4c8b-877f-475d18b214ed</id>
<name>com.xyst.dinas.biz.bill.Position</name>
<title>岗位</title>
<description>岗位</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>7d3fb6cf-49f4-4853-99e1-31ac1d8187ff</id>
<id>a8689e26-9636-4bf4-86cd-a222ab7ab0ea</id>
<name>com.xyst.dinas.biz.bill.ShipInfo$sequence</name>
<title>船舶备案$sequence</title>
<description>船舶备案</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>8506d811-7a6b-4d07-8d32-4db48373d793</id>
<id>b88fa486-63de-44d3-815b-b4901fba1eab</id>
<name>com.xyst.dinas.biz.bill.ShipInfo$serial</name>
<title>船舶备案$serial</title>
<description>船舶备案</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>b21c4367-9961-4309-9431-1f8f81db81ab</id>
<id>a0195bba-5b88-45f6-b573-e76d732d60e4</id>
<name>com.xyst.dinas.biz.bill.ShipInfo</name>
<title>船舶备案</title>
<description>船舶备案</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>8c893f97-3dac-458b-9db3-f11babfd31d0</id>
<id>ffee6a43-9515-4119-9109-2a467ddfb15c</id>
<name>com.xyst.dinas.biz.bill.Station$sequence</name>
<title>场站$sequence</title>
<description>场站</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>e6ef9f42-473c-41f8-811c-310992045e94</id>
<id>ea91eb63-74f4-475e-a50f-91d7f7c1d2e7</id>
<name>com.xyst.dinas.biz.bill.Station$serial</name>
<title>场站$serial</title>
<description>场站</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>f42e5753-50a4-4ee1-916f-d39181a42bb3</id>
<id>41c6861b-d128-4511-8263-30e77c688b64</id>
<name>com.xyst.dinas.biz.bill.Station</name>
<title>场站</title>
<description>场站</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>ff1f636a-355b-4387-b4d8-672b4f5aa541</id>
<id>6a3b7eaf-613d-42e0-abab-93ced97d18bb</id>
<name>com.xyst.dinas.contract.bill.ContractBill$sequence</name>
<title>合同单据$sequence</title>
<description>合同单据</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>19f2b2cc-cd0f-4ce9-b379-c8496c43a45f</id>
<id>7fff40e7-ca1e-4032-9a23-8a2c8f691112</id>
<name>com.xyst.dinas.contract.bill.ContractBill$serial</name>
<title>合同单据$serial</title>
<description>合同单据</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>369a4953-d570-43a4-9ce5-b4cd25dbafb8</id>
<id>7fb56835-dcd0-484e-a8f4-bb13a32e27a3</id>
<name>com.xyst.dinas.contract.bill.ContractBill</name>
<title>合同单据</title>
<description>合同单据</description>
......
......@@ -53,7 +53,7 @@
</m:annotations>
<m:id>77e202d5-a342-436c-8042-adcaa8dde410</m:id>
<m:name>purchaseAmount</m:name>
<m:title>砂石量(吨)</m:title>
<m:title>砂石采购量(吨)</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
......@@ -74,7 +74,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>77e202d5-a342-436c-8041-adcaa8dde410</m:id>
<m:id>77e202d5-a342-436c-8042-adcaa8dde410</m:id>
<m:name>dinasAmount</m:name>
<m:title>合同砂石余量(吨)</m:title>
<m:type>fixnum</m:type>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>b53b24f7-71a6-496f-8282-ebc6d451e662</id>
<id>c1457ee7-a376-4e14-913e-0501ff898b6b</id>
<name>com.xyst.dinas.oa.bill.BusinessTripApply$sequence</name>
<title>出差申请$sequence</title>
<description>出差申请</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>5dd6a597-4cf3-4491-adbf-d40a95e385d0</id>
<id>28bf95b5-c295-48a7-8bc0-f81f47f7a8d3</id>
<name>com.xyst.dinas.oa.bill.BusinessTripApply$serial</name>
<title>出差申请$serial</title>
<description>出差申请</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>cfe8e600-af7d-4833-b6e8-6dc1100f6b93</id>
<id>2a86d569-113a-41f2-a8bf-27f6cba4c28f</id>
<name>com.xyst.dinas.oa.bill.BusinessTripApply</name>
<title>出差申请</title>
<description>出差申请</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>96c99f5c-c7c9-416a-8e00-0cffa4abda06</id>
<id>c3dfef2a-976c-410a-9aed-a0a5cff0b2cd</id>
<name>com.xyst.dinas.oa.bill.ProtocolDocument$sequence</name>
<title>拟文$sequence</title>
<description>拟文</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>069a7fe1-5ffd-4e26-81cd-4f2b5cdeca84</id>
<id>7012dd50-ccee-48f5-850f-893816a90aed</id>
<name>com.xyst.dinas.oa.bill.ProtocolDocument$serial</name>
<title>拟文$serial</title>
<description>拟文</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>ef3988a9-1651-44f9-b3dd-cc8ffbd6b81f</id>
<id>15878d92-586e-4039-a206-892163da9840</id>
<name>com.xyst.dinas.oa.bill.ProtocolDocument</name>
<title>拟文</title>
<description>拟文</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>5c7b172a-9b3b-4004-8f8d-3ec99e54b4f2</id>
<id>34fc29c4-7459-46d2-99ba-9449e92b7d95</id>
<name>com.xyst.dinas.oa.bill.SealBorrow$sequence</name>
<title>证章借出$sequence</title>
<description>证章借出</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>a6737352-b6a9-49f5-9deb-b682867edaad</id>
<id>849d2e04-029c-4e7f-8e28-812a620b1e85</id>
<name>com.xyst.dinas.oa.bill.SealBorrow$serial</name>
<title>证章借出$serial</title>
<description>证章借出</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>aa0cb35f-4952-490b-8e77-6beaecf93bd1</id>
<id>aceb1ae4-bc64-419a-9d11-51f48a2a5c32</id>
<name>com.xyst.dinas.oa.bill.SealBorrow</name>
<title>证章借出</title>
<description>证章借出</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>e7df8e32-cc9d-4f9b-b919-6717a2623892</id>
<id>062b6fb2-e59f-43a8-81b2-67f4f22eb8a8</id>
<name>com.xyst.dinas.oa.bill.UseCarApply$sequence</name>
<title>用车申请$sequence</title>
<description>用车申请</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>7411cbb8-9383-4619-96d8-a2d2682132e4</id>
<id>7a6f7ee4-3f41-443f-b6bd-3b16a3a726c5</id>
<name>com.xyst.dinas.oa.bill.UseCarApply$serial</name>
<title>用车申请$serial</title>
<description>用车申请</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>61d17821-a2e0-48cb-be6f-abbc14bde47b</id>
<id>766910b5-d9c1-40dc-92c4-954bb2033c81</id>
<name>com.xyst.dinas.oa.bill.UseCarApply</name>
<title>用车申请</title>
<description>用车申请</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>a7b5a02c-dbf4-4c67-bb7b-1f0d2d5e4d7b</id>
<id>4946684a-f045-4c76-aad5-d6b1c4b6d67e</id>
<name>com.xyst.dinas.project.bill.ProjectFiled$sequence</name>
<title>项目备案$sequence</title>
<description>项目备案</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>c941d389-ee9e-4162-bcce-e32a54c68713</id>
<id>f9b08722-00c9-405b-b6a1-7137953b8f71</id>
<name>com.xyst.dinas.project.bill.ProjectFiled$serial</name>
<title>项目备案$serial</title>
<description>项目备案</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>febcacd7-bb80-47f2-994e-ed88ab720596</id>
<id>1dccbb51-6717-4060-8ae4-ed38bcafb6ee</id>
<name>com.xyst.dinas.project.bill.ProjectFiled</name>
<title>项目备案</title>
<description>项目备案</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>e779a27a-539c-437a-a75a-30aface6cd79</id>
<id>2d094039-ce8d-482d-b6fb-504d65cba20e</id>
<name>com.xyst.dinas.project.bill.PurchaseSandCompany$sequence</name>
<title>购砂单位$sequence</title>
<description>购砂单位</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>a91a7925-05a9-4447-9d4e-87fdfb8c1ac9</id>
<id>2b9b4f79-a1e1-4d66-aeb6-59923c4365fc</id>
<name>com.xyst.dinas.project.bill.PurchaseSandCompany$serial</name>
<title>购砂单位$serial</title>
<description>购砂单位</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>361cae87-b4fc-4392-b910-2b84a90dd0f9</id>
<id>c3ab7a3f-69b5-4334-be19-a54cf8b8c0ee</id>
<name>com.xyst.dinas.project.bill.PurchaseSandCompany</name>
<title>购砂单位</title>
<description>购砂单位</description>
......
......@@ -2,18 +2,19 @@ package com.xyst.dinas.sales.config;
import org.springframework.context.annotation.Bean;
import com.xyst.dinas.sales.dao.SalesPlanDao;
import com.xyst.dinas.sales.internal.service.SalesPlanServiceImpl;
import com.xyst.dinas.sales.service.SalesPlanService;
import com.xyst.dinas.sales.task.SalesPlanAutoCreateTaskRegister;
import com.xyst.dinas.sales.dao.InventoryDao;
import com.xyst.dinas.sales.dao.NeedPlanDao;
import com.xyst.dinas.sales.dao.SalesPlanDao;
import com.xyst.dinas.sales.internal.dao.InventoryDaoImpl;
import com.xyst.dinas.sales.internal.dao.NeedPlanDaoImpl;
import com.xyst.dinas.sales.internal.service.InventoryServiceImpl;
import com.xyst.dinas.sales.internal.service.NeedPlanServiceImpl;
import com.xyst.dinas.sales.internal.service.SalesPlanServiceImpl;
import com.xyst.dinas.sales.processor.SalesPlanTempProcessor;
import com.xyst.dinas.sales.service.InventoryService;
import com.xyst.dinas.sales.service.NeedPlanService;
import com.xyst.dinas.sales.service.SalesPlanService;
import com.xyst.dinas.sales.task.SalesPlanAutoCreateTaskRegister;
import com.xyst.dinas.sales.web.InventoryController;
import com.xyst.dinas.sales.web.NeedPlanController;
import com.xyst.dinas.sales.web.SalesPlanController;
......@@ -35,6 +36,7 @@ public class SalesConfiguration {
return new InventoryDaoImpl();
}
/***********销售计划******************/
@Bean
public SalesPlanController salesPlanController() {
return new SalesPlanController();
......@@ -53,6 +55,13 @@ public class SalesConfiguration {
public SalesPlanAutoCreateTaskRegister salesPlanAutoCreateTaskRegister() {
return new SalesPlanAutoCreateTaskRegister();
}
@Bean("com.xyst.dinas.sales.processor.SalesPlanTempProcessor")
public SalesPlanTempProcessor salesPlanTempProcessor() {
return new SalesPlanTempProcessor();
}
/***********需用计划******************/
public NeedPlanController needPlanController() {
return new NeedPlanController();
......
......@@ -9,6 +9,10 @@ public class SalesPlanConstant {
/** 审批状态*/
public static final String APPROVE_STATE = "approveState";
/** 审批时间*/
public static final String APPROVE_TIME = "approveTime";
/** 审批备注*/
public static final String APPROVE_MEMO = "approveMemo";
/** 合同*/
......@@ -34,5 +38,6 @@ public class SalesPlanConstant {
/** 库存量*/
public static final String stockAmount = "stockAmount";
/** 临时销售计划主表-实体*/
public static final String ENTITY_TEMP = "com.xyst.dinas.sales.datamodel.SalesPlanTemp";
}
package com.xyst.dinas.sales.dao;
import java.util.Date;
import java.util.List;
import java.util.UUID;
......@@ -67,4 +68,29 @@ public class SalesPlanDao {
});
}
public KObject queryTempSalesPlan(UUID id) {
return (KObject) template.get(SalesPlanConstant.ENTITY_TEMP, id);
}
/**
* 审批日常销售计划
* @param id
* @param approveState
* @param approveMemo
*/
public void modifyApproveStateForDaily(UUID id,int approveState,String approveMemo) {
modifyApproveState(SalesPlanConstant.ENTITY, id, approveState, approveMemo);
}
//审批临时销售计划
public void modifyApproveStateForTemp(UUID id,int approveState,String approveMemo) {
modifyApproveState(SalesPlanConstant.ENTITY_TEMP, id, approveState, approveMemo);
}
private void modifyApproveState(String entityName,UUID id,int approveState,String approveMemo) {
KObject kobject =(KObject) template.get(entityName, id);
kobject.set(SalesPlanConstant.APPROVE_STATE, approveState);
kobject.set(SalesPlanConstant.APPROVE_TIME, new Date());
kobject.set(SalesPlanConstant.APPROVE_MEMO, approveMemo);
update(kobject);
}
}
package com.xyst.dinas.sales.enumeration;
/**
* 运输方式
*
* @author Jackpot
* @date 2021年4月14日
*/
public enum transportModeEnum {
/**
* 自提
*/
SELF_EXTRACT(0),
/**
* 配送
*/
DELIVERY(1),
;
int value;
transportModeEnum(int value) {
this.value = value;
}
public int getValue() {
return value;
}
public void setValue(int value) {
this.value = value;
}
}
......@@ -94,4 +94,25 @@ public class SalesPlanServiceImpl implements SalesPlanService{
public void update(KObject salesPlan) {
salesPlanDao.update(salesPlan);
}
public void approveSalesPlanForDaily(UUID id,int approveState,String approveMemo) {
salesPlanDao.modifyApproveStateForDaily(id, approveState, approveMemo);
}
public void approveSalesPlanForTemp(UUID id,int approveState,String approveMemo) {
salesPlanDao.modifyApproveStateForTemp(id, approveState, approveMemo);
}
/***************临时销售计划*****************/
public KObject queryTempSalesPlan(UUID id) {
return salesPlanDao.queryTempSalesPlan(id);
}
}
package com.xyst.dinas.sales.processor;
import java.util.List;
import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.query.entity.RowData;
import com.beecode.inz.query.processor.DataProcessor;
import com.beecode.inz.query.processor.DataProcessorContext;
import com.xyst.dinas.sales.service.SalesPlanService;
/**
* 临时销售计划查询处理
*
* @author Jackpot
* @date 2021年4月14日
*/
public class SalesPlanTempProcessor implements DataProcessor {
@Autowired
private SalesPlanService salesPlanService;
@Override
public void process(DataProcessorContext context) {
List<RowData> rowDatas = context.getRowDatas();
for (RowData row : rowDatas) {
UUID id = UUID.fromString(row.get("id").toString());
KObject salesPlan = salesPlanService.queryTempSalesPlan(id);
Assert.notNull(salesPlan, "找不到对应的销售计划!");
String dinasTypeNames = "";
List<KObject> list = salesPlan.get("SalesPlanTempDetails").toList();
for (int i = 0; i < list.size(); i++) {
KObject detail = list.get(i);
if (i == list.size() - 1) {
dinasTypeNames += detail.get("dinasType").getString("dinasTypeName");
} else {
dinasTypeNames += detail.get("dinasType").getString("dinasTypeName") + ",";
}
}
row.put("dinasTypeNames", dinasTypeNames);
}
}
}
......@@ -31,4 +31,11 @@ public interface SalesPlanService {
public void update(KObject salesPlan);
public KObject queryTempSalesPlan(UUID id) ;
public void approveSalesPlanForDaily(UUID id,int approveState,String approveMemo);
public void approveSalesPlanForTemp(UUID id,int approveState,String approveMemo);
}
package com.xyst.dinas.sales.web;
import java.util.Date;
import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.xyst.dinas.sales.service.SalesPlanService;
import com.xyst.dinas.sales.web.request.SaleaPlanApprove;
@RestController
public class SalesPlanController {
@PostMapping("/salesplan/approve/{id}/{state}")
public ResponseObj approveSalesPlan(@PathVariable UUID id, @PathVariable Integer state) {
@Autowired
private SalesPlanService salesPlanService;
@PostMapping("/salesplan/approve")
public ResponseObj approveSalesPlan(SaleaPlanApprove saleaPlanApprove) {
UUID id = saleaPlanApprove.getId();
Integer approveState = saleaPlanApprove.getApproveState();
Assert.notNull(id, "The id must not be null");
Assert.notNull(state, "The state must not be null");
Assert.notNull(approveState, "The approveState must not be null");
salesPlanService.approveSalesPlanForDaily(id, approveState, saleaPlanApprove.getApproveMemo());
return ResponseObj.success();
}
Date approveTime = new Date();
@PostMapping("/salesplan/temp/approve")
public ResponseObj approveSalesPlanForTemp(SaleaPlanApprove saleaPlanApprove) {
UUID id = saleaPlanApprove.getId();
Integer approveState = saleaPlanApprove.getApproveState();
Assert.notNull(id, "The id must not be null");
Assert.notNull(approveState, "The approveState must not be null");
salesPlanService.approveSalesPlanForTemp(id, approveState, saleaPlanApprove.getApproveMemo());
return ResponseObj.success();
}
......
package com.xyst.dinas.sales.web.request;
import java.io.Serializable;
import java.util.UUID;
public class SaleaPlanApprove implements Serializable{
private static final long serialVersionUID = 1L;
private UUID id;
private Integer approveState;
private String approveMemo;
public UUID getId() {
return id;
}
public void setId(UUID id) {
this.id = id;
}
public Integer getApproveState() {
return approveState;
}
public void setApproveState(Integer approveState) {
this.approveState = approveState;
}
public String getApproveMemo() {
return approveMemo;
}
public void setApproveMemo(String approveMemo) {
this.approveMemo = approveMemo;
}
}
<model>
<header>
<type>bcp.biz.Bill</type>
<package>com.xyst.dinas.sales.bill</package>
<title>临时销售计划</title>
<name>SalesPlanTemp</name>
<description></description>
</header>
<content>
<bill>
<data>
{"baseData":{"name":"SalesPlanTemp","title":"临时销售计划","billModel":"com.beecode.bap.biztrait.BasicBillBiztrait","functionLibrarys":[],"description":"临时销售计划","dataModel":"com.xyst.dinas.sales.datamodel.SalesPlanTemp"},"serial":{"serialData":[{"segment":"literal","segmentData":"EM"},{"segment":"sequence","segmentData":{"start-with":0,"increment":1,"min":0,"max":99999,"length":5,"cycle":true,"cut-direction":"left","pad-string":"0","pad-direction":"left","cache-size":10}}],"buildTime":"add"},"formula":[],"workflow":{"workflow":"","processParamConfig":[]},"print":[],"authority":[]}
</data>
</bill>
</content>
</model>
\ No newline at end of file
<model>
<header>
<type>bcp.type.DataModel</type>
<package>com.xyst.dinas.sales.datamodel</package>
<title>临时销售计划</title>
<name>SalesPlanTemp</name>
<tags></tags>
<description></description>
<templateName>mk.ide.ui.editor.data.model.template.bill</templateName>
<tablePrefix>xyst_dinas_</tablePrefix>
</header>
<content>
<dataModel id='07370bf1-fe90-4b73-9ba1-4d2ba742b0f4' multiVersion='' domainInherit='undefined' tableName='xyst_dinas_sale_plan_temp'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='1cbe2d59-e855-4a28-90eb-7ce85c28a525' name='regionCompany' columnName='region_company' title='区域公司' type='com.xyst.dinas.biz.datamodel.Organization' default='' precision='' isArray='false'>
<annotation id='ffa11f65-fcb2-429d-a590-40402fb8fde1' attributeId='9a1656c2-7a72-433b-ab6b-6fd19bf5af26' name='length' value='undefined'></annotation>
<annotation id='bf5d8736-9d14-40b8-bd2f-70899ee1491b' attributeId='e5516bce-9abf-46bf-a9a1-19694076464d' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='223d42f7-5d33-461d-9e00-33a5b6bfc87e' name='planningCycle' columnName='planning_cycle' title='计划周期' type='com.xyst.dinas.biz.datamodel.PlanningCycle' default='' precision='' isArray='false'>
<annotation id='ce75318c-46ca-45a7-8482-f400cebd8b4c' attributeId='25d7dcfa-2180-4114-b1e7-e21db55f6cc5' name='length' value='undefined'></annotation>
<annotation id='2a5fc5c6-1edd-4fb9-a837-af11f9edeaa3' attributeId='5ce24bb8-0fb8-4765-9b78-eb8cd43c31bb' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='ba52ab30-c94b-4ade-8179-4ab47c16323c' name='contract' columnName='contract' title='合同' type='com.xyst.dinas.contract.datamodel.Contract' default='' precision='' isArray='false'>
<annotation id='0576ede6-b27b-4e6c-9bdb-f41bb8acd8d6' attributeId='0205a417-2cf6-4eec-84d1-1a9eecd1efd8' name='length' value='undefined'></annotation>
<annotation id='ada2d620-105b-47b4-88e2-ca1a20f77124' attributeId='ed744460-9e80-43fb-a1b1-541039f01dbd' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='4846c3a5-e83b-484f-ac2b-9c2761260624' name='project' columnName='project' title='项目' type='com.xyst.dinas.project.datamodel.ProjectFiled' default='' precision='' isArray='false'>
<annotation id='acdea327-5c5b-4214-9a7b-45be2ff4009c' attributeId='48cb7b55-651b-4ae0-a5fb-706f3526a684' name='length' value='undefined'></annotation>
<annotation id='5f83ce63-cd63-4e3e-b6f7-f209d4da49bb' attributeId='24ef035c-f9bb-47e4-9cce-b400177f26c1' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='c4154a1b-f727-48cf-9ef0-ad1bee512504' name='station' columnName='station' title='场站' type='com.xyst.dinas.biz.datamodel.Station' default='' precision='' isArray='false'>
<annotation id='00caecc1-35aa-4342-90c8-250f84609fe4' attributeId='55efd3f5-036a-4ac4-83c9-14e22cf5465a' name='length' value='undefined'></annotation>
<annotation id='95a6dd6d-c676-4265-9c8b-d115c13b472f' attributeId='43768653-e259-4b0f-8c9d-8739f030675b' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='125f959d-a8e3-41f7-96a4-b0d533d51930' name='transportMode' columnName='transport_mode' title='运输方式' type='string' default='' precision='' isArray='false'>
<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>
</attribute>
<attribute id='a52906e5-5b99-48c2-8b65-411f32ffa90f' name='totalPlanAmount' columnName='total_plan_amount' title='销售计划总量' type='fixnum' default='' precision='' isArray='false'>
<annotation id='d7f8eac6-3f6d-4847-b6ea-ceeedadffbb6' attributeId='fcff3632-1871-4b01-97b7-7debaaed13e8' name='length' value='undefined'></annotation>
</attribute>
<attribute id='0933ceb1-f327-4372-a316-cffa1c80991a' name='approveMemo' columnName='approve_memo' title='审批备注' type='string' default='' precision='' isArray='false'>
<annotation id='6f08f4ca-1f77-4ed4-a627-0fb8843959fa' attributeId='dfbeaa83-63dc-4638-b55a-8dda62d74dd4' name='length' value='400'></annotation>
</attribute>
<attribute id='0933ceb1-f327-4372-a316-cffa1c80991a' name='approveTime' columnName='approve_time' title='审批时间' type='datetime' default='' precision='' isArray='false'>
<annotation id='6f08f4ca-1f77-4ed4-a627-0fb8843959fa' attributeId='dfbeaa83-63dc-4638-b55a-8dda62d74dd4' name='length' value='undefined'></annotation>
</attribute>
<childModel id='d667dff0-2b8b-497c-b126-99b9d0e4de2f' attributeId='b706360e-39b1-44c5-9ed6-0b82c4a72807' refParentAttributeId='ccddb9cc-707e-4c56-890b-5272f1268d3c'
name='SalesPlanTempDetails' tableName='xyst_dinas_sale_plan_temp_detail' domainInherit='' title='临时销售计划子表' >
<parent>com.beecode.bap.biztrait.datamodel.StoreSubTableRequirement</parent>
<attribute id='4c3923a4-9631-439f-bdac-1ee06c057765' name='dinasType' columnName='dinas_type' title='砂石类型' type='com.xyst.dinas.biz.datamodel.DinasType' default='' precision='' isArray='false'>
<annotation id='c84c0bf7-a290-4a09-898e-d3bed7f35800' attributeId='de1a3fad-c9da-4c1d-bfaa-21c462a18ca1' name='length' value='undefined'></annotation>
<annotation id='4f93adc6-53c2-436c-a884-23461a152562' attributeId='dec7cfa3-3094-4bb0-a1c3-8e8284449ab6' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='37471a83-19f0-41f2-9ef7-2b50f8631f97' name='salesPlanAmount' columnName='sales_plan_amount' title='销售计划量' type='fixnum' default='' precision='' isArray='false'>
<annotation id='fa8b773c-25f3-476b-8b3a-df12fabe0dd9' attributeId='4c56e2cb-84e0-4764-8e4f-2ca547157f58' name='length' value='undefined'>
</annotation>
</attribute>
<attribute id='f5b3962a-7f92-42e3-bb98-41527cebad15' name='contractAvailableAmount' columnName='contract_available_amount' title='合同可用余量' type='fixnum' default='' precision='' isArray='false'>
<annotation id='4005aa73-e4cf-4927-9f0d-1d12895a530c' attributeId='b9cb8a83-5df9-4a76-a3f7-6ec419084dc8' name='length' value='undefined'> </annotation>
</attribute>
<attribute id='b73e7180-c711-41d4-af55-91d9bcbc44a3' name='actualSaleAmount' columnName='actual_sale_amount' title='实际销售量' type='fixnum' default='' precision='' isArray='false'>
<annotation id='23821b28-6635-43a6-a096-4a58e1e026c5' attributeId='e6f31a1d-c5a8-47e8-a9bf-5e1de125111a' name='length' value='undefined'></annotation>
</attribute>
</childModel>
<hibernate>/xyst.dinas.sales/src/main/resources/config/SalesPlanTemp.hbm.xml</hibernate>
</dataModel>
</content>
</model>
\ No newline at end of file
......@@ -33,7 +33,7 @@
<description></description>
</field>
<field title='区域公司'>
<name>regionalCompany.id</name>
<name>regionCompany.id</name>
<type>uuid</type>
<ref>
<type></type>
......
<model>
<header>
<type>inz.query.Query</type>
<package>com.xyst.dinas.sales.query</package>
<name>SalesPlanTemp</name>
<title>临时销售计划</title>
<tags></tags>
<description></description>
</header>
<content>
<customQuery id='451f4875-82d2-486b-b624-325692e93b28'>
<kclass>com.xyst.dinas.sales.datamodel.SalesPlanTemp</kclass>
<dataProcessor>com.xyst.dinas.sales.processor.SalesPlanTempProcessor</dataProcessor>
<authorityItem></authorityItem>
<innerScene title='全部'>
<id>c775c023-9960-4039-9e9c-d3ff544308b5</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>d599e9e6-1d0e-43c8-87de-8609f5bcd1b7</id>
<javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<field title='id'>
<name>id</name>
<type>uuid</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='区域公司'>
<name>regionCompany.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.Organization</name>
</ref>
<description></description>
</field>
<field title='计划周期'>
<name>planningCycle.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.PlanningCycle</name>
</ref>
<description></description>
</field>
<field title='计划周期title'>
<name>planningCycle.title</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.PlanningCycle</name>
</ref>
<description></description>
</field>
<field title='审批时间'>
<name>approveTime</name>
<type>datetime</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='审批状态'>
<name>approveState</name>
<type>int</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='审批意见'>
<name>approveMemo</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='项目'>
<name>project.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.project.datamodel.ProjectFiled</name>
</ref>
<description></description>
</field>
<field title='项目名称'>
<name>project.projectName</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='销售计划总量'>
<name>totalPlanAmount</name>
<type>float</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='创建时间'>
<name>createTime</name>
<type>datetime</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='创建人'>
<name>creator.name</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='修改时间'>
<name>modifyTime</name>
<type>datetime</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='修改人'>
<name>modifier.name</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='废弃'>
<name>discard</name>
<type>boolean</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
</customQuery>
</content>
</model>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>a0b9dd7e-c56e-45af-9010-4e5619a081fb</id>
<id>dc491d79-c661-41b7-b972-2610d41a0b4f</id>
<name>com.xyst.dinas.sales.bill.NeedPlan$sequence</name>
<title>需用计划$sequence</title>
<description>需用计划</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>0ebd8e10-135f-42b3-8a8c-59a23a27d743</id>
<id>915502ee-df4a-4308-8cda-a1b5eb8a31db</id>
<name>com.xyst.dinas.sales.bill.NeedPlan$serial</name>
<title>需用计划$serial</title>
<description>需用计划</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>6fb6811d-fa60-45d2-8ac9-a90c3183094f</id>
<id>d40bd4d2-24b6-4d11-b9fb-2ef125b22852</id>
<name>com.xyst.dinas.sales.bill.NeedPlan</name>
<title>需用计划</title>
<description>需用计划</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>e10fc313-ed57-4ebf-bc47-b8775e0f5bac</id>
<id>100c6cd7-ae60-4f55-ab58-7db886391f54</id>
<name>com.xyst.dinas.sales.bill.SalesPlan$sequence</name>
<title>销售计划$sequence</title>
<description>销售计划</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>0212f404-0479-4d6a-a9a3-35c173b45c0d</id>
<id>eba6cd19-afd5-4d52-8f09-25c9dcdb49c4</id>
<name>com.xyst.dinas.sales.bill.SalesPlan$serial</name>
<title>销售计划$serial</title>
<description>销售计划</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>09a4020c-fab4-40f3-9c82-668252dcca1e</id>
<id>771ff308-808f-4104-b33e-d55d0364ea58</id>
<name>com.xyst.dinas.sales.bill.SalesPlan</name>
<title>销售计划</title>
<description>销售计划</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>949dc8a3-38bf-484c-9734-592ad94940dc</id>
<name>com.xyst.dinas.sales.bill.SalesPlanTemp$sequence</name>
<title>临时销售计划$sequence</title>
<define>bcp.sequence</define>
<define-version>1.0</define-version>
<content>
<m:sequence>
<m:start-with>0</m:start-with>
<m:increment>1</m:increment>
<m:max>99999</m:max>
<m:min>0</m:min>
<m:cycle>true</m:cycle>
<m:cache-size>10</m:cache-size>
</m:sequence>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>0b18b8fa-5483-4ea7-9b0d-a2be25b7ea89</id>
<name>com.xyst.dinas.sales.bill.SalesPlanTemp$serial</name>
<title>临时销售计划$serial</title>
<define>bcp.serial</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.sales.datamodel.SalesPlanTemp</dependency>
<dependency>com.xyst.dinas.sales.bill.SalesPlanTemp$sequence</dependency>
<content>
<m:serial>
<m:input>com.xyst.dinas.sales.datamodel.SalesPlanTemp</m:input>
<m:functionLibrarys/>
<m:segments>
<m:literal>
<m:value>EM</m:value>
</m:literal>
<m:sequence>
<m:length>5</m:length>
<m:pad-direction>left</m:pad-direction>
<m:pad-string>0</m:pad-string>
<m:key>com.xyst.dinas.sales.bill.SalesPlanTemp$serial</m:key>
<m:sequenceName>com.xyst.dinas.sales.bill.SalesPlanTemp$sequence</m:sequenceName>
</m:sequence>
</m:segments>
</m:serial>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>6a0d8d8e-7bb3-4193-a913-f43d73d390ff</id>
<name>com.xyst.dinas.sales.bill.SalesPlanTemp</name>
<title>临时销售计划</title>
<define>bcp.biz.Biztype</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.sales.bill.SalesPlanTemp$serial</dependency>
<dependency>com.beecode.bap.biztrait.BasicBillBiztrait</dependency>
<dependency>com.xyst.dinas.sales.datamodel.SalesPlanTemp</dependency>
<content>
<m:biztype>
<m:type>com.xyst.dinas.sales.datamodel.SalesPlanTemp</m:type>
<m:inheritances>
<m:inheritance>
<m:biztrait>com.beecode.bap.biztrait.BasicBillBiztrait</m:biztrait>
<m:config type="xml">
<m:content>&lt;billBasictraitConfig&gt;&lt;formulas/&gt;&lt;parents&gt;&lt;parent&gt;&lt;billCodeConfig&gt;&lt;serialName&gt;com.xyst.dinas.sales.bill.SalesPlanTemp$serial&lt;/serialName&gt;&lt;buildTime&gt;add&lt;/buildTime&gt;&lt;/billCodeConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;workflowConfig&gt;&lt;workflow&gt;&lt;/workflow&gt;&lt;/workflowConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;printConfig&gt;&lt;templates/&gt;&lt;/printConfig&gt;&lt;/parent&gt;&lt;/parents&gt;&lt;functionLibrarys/&gt;&lt;/billBasictraitConfig&gt;</m:content>
</m:config>
</m:inheritance>
</m:inheritances>
<m:methodAuthorityItems/>
</m:biztype>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>d667dff0-2b8b-497c-b126-99b9d0e4de2f</id>
<name>com.xyst.dinas.sales.datamodel.SalesPlanTemp$SalesPlanTempDetails</name>
<title>临时销售计划子表</title>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>com.beecode.bap.biztrait.datamodel.StoreSubTableRequirement</dependency>
<dependency>com.xyst.dinas.biz.datamodel.DinasType</dependency>
<dependency>bcp.type.constraint.Numeric</dependency>
<dependency>bcp.type.json.JsonIgnore</dependency>
<dependency>com.xyst.dinas.sales.datamodel.SalesPlanTemp</dependency>
<content>
<m:class>
<m:parents>
<m:parent>com.beecode.bap.biztrait.datamodel.StoreSubTableRequirement</m:parent>
</m:parents>
<m:attributes>
<m:attribute>
<m:annotations/>
<m:id>4c3923a4-9631-439f-bdac-1ee06c057765</m:id>
<m:name>dinasType</m:name>
<m:title>砂石类型</m:title>
<m:type>com.xyst.dinas.biz.datamodel.DinasType</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>0</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>0</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>37471a83-19f0-41f2-9ef7-2b50f8631f97</m:id>
<m:name>salesPlanAmount</m:name>
<m:title>销售计划量</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>0</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>0</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>f5b3962a-7f92-42e3-bb98-41527cebad15</m:id>
<m:name>contractAvailableAmount</m:name>
<m:title>合同可用余量</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>0</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>0</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>b73e7180-c711-41d4-af55-91d9bcbc44a3</m:id>
<m:name>actualSaleAmount</m:name>
<m:title>实际销售量</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.json.JsonIgnore</m:type>
</m:annotation>
</m:annotations>
<m:id>ccddb9cc-707e-4c56-890b-5272f1268d3c</m:id>
<m:name>master</m:name>
<m:title>master</m:title>
<m:type>com.xyst.dinas.sales.datamodel.SalesPlanTemp</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
</m:attributes>
</m:class>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>07370bf1-fe90-4b73-9ba1-4d2ba742b0f4</id>
<name>com.xyst.dinas.sales.datamodel.SalesPlanTemp</name>
<title>临时销售计划</title>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.biz.datamodel.Organization</dependency>
<dependency>bcp.type.constraint.StringLength</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.SubTableAnnotation</dependency>
<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
<dependency>bcp.type.constraint.Numeric</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
<dependency>com.xyst.dinas.project.datamodel.ProjectFiled</dependency>
<dependency>com.xyst.dinas.biz.datamodel.PlanningCycle</dependency>
<dependency>com.xyst.dinas.sales.datamodel.SalesPlanTemp$SalesPlanTempDetails</dependency>
<dependency>com.xyst.dinas.contract.datamodel.Contract</dependency>
<content>
<m:class>
<m:parents>
<m:parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</m:parent>
<m:parent>com.beecode.inz.common.datamodel.BaseInfo</m:parent>
</m:parents>
<m:attributes>
<m:attribute>
<m:annotations/>
<m:id>1cbe2d59-e855-4a28-90eb-7ce85c28a525</m:id>
<m:name>regionCompany</m:name>
<m:title>区域公司</m:title>
<m:type>com.xyst.dinas.biz.datamodel.Organization</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>223d42f7-5d33-461d-9e00-33a5b6bfc87e</m:id>
<m:name>planningCycle</m:name>
<m:title>计划周期</m:title>
<m:type>com.xyst.dinas.biz.datamodel.PlanningCycle</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>ba52ab30-c94b-4ade-8179-4ab47c16323c</m:id>
<m:name>contract</m:name>
<m:title>合同</m:title>
<m:type>com.xyst.dinas.contract.datamodel.Contract</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>4846c3a5-e83b-484f-ac2b-9c2761260624</m:id>
<m:name>project</m:name>
<m:title>项目</m:title>
<m:type>com.xyst.dinas.project.datamodel.ProjectFiled</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>c4154a1b-f727-48cf-9ef0-ad1bee512504</m:id>
<m:name>station</m:name>
<m:title>场站</m:title>
<m:type>com.xyst.dinas.biz.datamodel.Station</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>30</m:value>
</m:annotation>
</m:annotations>
<m:id>125f959d-a8e3-41f7-96a4-b0d533d51930</m:id>
<m:name>transportMode</m:name>
<m:title>运输方式</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>300</m:value>
</m:annotation>
</m:annotations>
<m:id>2e29930f-7250-4714-b41c-5bd3ffee2c4e</m:id>
<m:name>carNumber</m:name>
<m:title>车牌号</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>0</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>0</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>a52906e5-5b99-48c2-8b65-411f32ffa90f</m:id>
<m:name>totalPlanAmount</m:name>
<m:title>销售计划总量</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>400</m:value>
</m:annotation>
</m:annotations>
<m:id>0933ceb1-f327-4372-a316-cffa1c80991a</m:id>
<m:name>approveMemo</m:name>
<m:title>审批备注</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>0933ceb1-f327-4372-a316-cffa1c80991a</m:id>
<m:name>approveTime</m:name>
<m:title>审批时间</m:title>
<m:type>datetime</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>com.beecode.bap.biztrait.datamodel.SubTableAnnotation</m:type>
</m:annotation>
</m:annotations>
<m:id>b706360e-39b1-44c5-9ed6-0b82c4a72807</m:id>
<m:name>SalesPlanTempDetailss</m:name>
<m:title>临时销售计划子表</m:title>
<m:type>com.xyst.dinas.sales.datamodel.SalesPlanTemp$SalesPlanTempDetails[]</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
</m:attributes>
</m:class>
</content>
</metadata>
......@@ -40,7 +40,7 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>regionalCompany.id</m:name>
<m:name>regionCompany.id</m:name>
<m:title>区域公司</m:title>
<m:type>uuid</m:type>
<m:ref>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
<specification>1.0</specification>
<id>451f4875-82d2-486b-b624-325692e93b28</id>
<name>com.xyst.dinas.sales.query.SalesPlanTemp</name>
<title>临时销售计划</title>
<define>inz.query.Query</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.sales.datamodel.SalesPlanTemp</dependency>
<content>
<m:query>
<m:type>com.xyst.dinas.sales.datamodel.SalesPlanTemp</m:type>
<m:dataProcessor>com.xyst.dinas.sales.processor.SalesPlanTempProcessor</m:dataProcessor>
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>c775c023-9960-4039-9e9c-d3ff544308b5</m:id>
<m:title>全部</m:title>
<m:javaImplement>com.beecode.inz.common.scene.CommonAllScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>d599e9e6-1d0e-43c8-87de-8609f5bcd1b7</m:id>
<m:title>已废弃</m:title>
<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
</m:innerScenes>
<m:fields>
<m:field>
<m:name>id</m:name>
<m:title>id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>regionCompany.id</m:name>
<m:title>区域公司</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.Organization</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>planningCycle.id</m:name>
<m:title>计划周期</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.PlanningCycle</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>planningCycle.title</m:name>
<m:title>计划周期title</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.PlanningCycle</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>approveTime</m:name>
<m:title>审批时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>approveState</m:name>
<m:title>审批状态</m:title>
<m:type>int</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>approveMemo</m:name>
<m:title>审批意见</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>project.id</m:name>
<m:title>项目</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.project.datamodel.ProjectFiled</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>project.projectName</m:name>
<m:title>项目名称</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>totalPlanAmount</m:name>
<m:title>销售计划总量</m:title>
<m:type>float</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>createTime</m:name>
<m:title>创建时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>creator.name</m:name>
<m:title>创建人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifyTime</m:name>
<m:title>修改时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifier.name</m:name>
<m:title>修改人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>discard</m:name>
<m:title>废弃</m:title>
<m:type>boolean</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
</m:fields>
</m:query>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<hibernate-mapping xmlns="http://www.hibernate.org/xsd/hibernate-mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.hibernate.org/xsd/hibernate-mapping
http://www.hibernate.org/xsd/hibernate-mapping/hibernate-mapping-4.0.xsd">
<class entity-name="com.xyst.dinas.sales.datamodel.SalesPlanTemp" table="xyst_dinas_sale_plan_temp" optimistic-lock="version">
<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
<id name="id" type="uuid-binary" column="id" length="16">
<generator class="uuid2" />
</id>
<version name="version" type="int" column="version"/>
<property name="createTime" type="timestamp" not-null="false">
<column name="create_time"></column>
</property>
<many-to-one name="creator" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
<column name="creator_id" not-null="false"/>
</many-to-one>
<property name="modifyTime" type="timestamp" not-null="false">
<column name="modify_time"></column>
</property>
<many-to-one name="modifier" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
<column name="modifier_id" not-null="false"/>
</many-to-one>
<property name="billState" type="nstring" not-null="false">
<column name="bill_state" length="100"></column>
</property>
<many-to-one name="bizProcess" entity-name="com.beecode.bap.workflow.datamodel.BizProcess" fetch="select">
<column name="biz_process_id" not-null="false"/>
</many-to-one>
<property name="billCode" type="nstring" not-null="false">
<column name="bill_code" length="200"></column>
</property>
<property name="discard" type="boolean" not-null="false">
<column name="discard"></column>
</property>
<property name="del" type="boolean" not-null="false">
<column name="del"></column>
</property>
<property name="approveState" type="integer" not-null="false">
<column name="approve_state"></column>
</property>
<property name="approveMemo" type="nstring" not-null="false">
<column name="approve_memo" length="200"></column>
</property>
<property name="approveTime" type="timestamp" not-null="false">
<column name="approve_time"></column>
</property>
<many-to-one name="regionCompany" entity-name="com.xyst.dinas.biz.datamodel.Organization" fetch="select">
<column name="region_company" not-null="false"></column>
</many-to-one>
<many-to-one name="project" entity-name="com.xyst.dinas.project.datamodel.ProjectFiled" fetch="select">
<column name="project" not-null="false"></column>
</many-to-one>
<many-to-one name="contract" entity-name="com.xyst.dinas.contract.datamodel.Contract" fetch="select">
<column name="contract" not-null="false"></column>
</many-to-one>
<many-to-one name="planningCycle" entity-name="com.xyst.dinas.biz.datamodel.PlanningCycle" fetch="select">
<column name="planning_cycle" not-null="false"></column>
</many-to-one>
<many-to-one name="station" entity-name="com.xyst.dinas.biz.datamodel.Station" fetch="select">
<column name="station" not-null="false"></column>
</many-to-one>
<property name="transportMode" type="nstring" not-null="false">
<column name="transport_mode" length="30"></column>
</property>
<property name="carNumber" type="nstring" not-null="false">
<column name="car_number" length="100"></column>
</property>
<property name="totalPlanAmount" type="big_decimal" not-null="false">
<column name="total_plan_amount" precision="12" scale="4"></column>
</property>
<bag name="SalesPlanTempDetails" lazy="true" fetch="select" inverse="true">
<key column="master_id" not-null="true" />
<one-to-many entity-name="com.xyst.dinas.sales.datamodel.SalesPlanTemp$SalesPlanTempDetails" />
</bag>
</class>
<class entity-name="com.xyst.dinas.sales.datamodel.SalesPlanTemp$SalesPlanTempDetails" table="xyst_dinas_sale_plan_temp_detail">
<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
<id name="id" type="uuid-binary" column="id" length="16">
<generator class="uuid2" />
</id>
<many-to-one name="master" entity-name="com.xyst.dinas.sales.datamodel.SalesPlanTemp" fetch="select">
<column name="master_id" not-null="false"/>
</many-to-one>
<many-to-one name="dinasType" entity-name="com.xyst.dinas.biz.datamodel.DinasType" fetch="select">
<column name="dinas_type" not-null="false"></column>
</many-to-one>
<property name="salesPlanAmount" type="big_decimal" not-null="false">
<column name="sales_plan_amount" precision="12" scale="4"></column>
</property>
<property name="contractAvailableAmount" type="big_decimal" not-null="false">
<column name="contract_available_amount" precision="12" scale="4"></column>
</property>
<property name="actualSaleAmount" type="big_decimal" not-null="false">
<column name="actual_sale_amount" precision="12" scale="4"></column>
</property>
</class>
</hibernate-mapping>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment