Skip to content

C
cloud-fb
Commit 8687e8ed by 焦凯
Options

Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop 

# Conflicts:
#	backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/service/ContractServiceImpl.java
#	backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesPlanServiceImpl.java
parents ae5eca38 e364885e
Showing with 2174 additions and 429 deletions
backend/inz.authmgr/src/main/java/com/beecode/inz/authmgr/web/AuthMgrController.java
......@@ -76,7 +76,7 @@ public class AuthMgrController {
private final static String CLUEPOOL = "CluePool";
// 锚点顺序
private final static String[] ANCHOR_ORDER = { "资源", "招商", "物业","移动端", "其他" };
private final static String[] ANCHOR_ORDER = { "项目", "合同", "监控", "生产", "销售", "资金" , "运输", "安健环", "价格", "OA办公", "业务管理", "其他" };
protected final static Logger logger = LoggerFactory.getLogger(AuthMgrController.class);
......@@ -311,9 +311,6 @@ public class AuthMgrController {
String[] title = category.split("/");
// 锚点
String anchor = title[0];
if(anchor.equals("资产")) {
anchor = "资源";
}
// 锚点包含的内容
String privilege = title[1];
info.setCategory(privilege);
......
backend/inz.basis/src/main/model/com/beecode/inz/basis/auth/CustomerList.mk deleted 100644 → 0
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.beecode.inz.basis.auth</package>
<name>CustomerList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='7b19c7f9-15b1-4709-bfb8-65de3f44365c' category='招商/注册用户' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/inz.basis/src/main/resources/com/beecode/inz/basis/auth/CustomerList.jmx deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>7b19c7f9-15b1-4709-bfb8-65de3f44365c</id>
<name>com.beecode.inz.basis.auth.CustomerList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>招商/注册用户</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/inz.init.data/src/main/resources/com/beecode/inz/basis/auth/Role.json
[
{
"name": "role001",
"title": "资产管理员",
"description": "对资产进行管理",
"roleGroup": "roleGroup01",
"privilegeNames":
[
],
"privilegeGroupNames":
[
"资产/项目",
"资产/地块",
"资产/楼栋",
"资产/租控图"
]
},
{
"name": "role002",
"title": "市场推广人员",
"description": "仅做市场活动相关",
"roleGroup": "roleGroup01",
"privilegeGroupNames":
[
"招商/市场活动",
"招商/线索"
]
},
{
"name": "role003",
"title": "数据录入员",
"description": "录入线索及向公海里录入信息",
"roleGroup": "roleGroup01",
"privilegeGroupNames":
[
"招商/线索",
"招商/客户"
]
},
{
"name": "role005",
"title": "招商人员",
"description": "录入合同，查看合同信息",
"roleGroup": "roleGroup01",
"privilegeNames":
[
],
"privilegeGroupNames":
[
"资产/租控图",
"招商/市场活动",
"招商/线索",
"招商/客户",
"招商/联系人",
"招商/拜访",
"招商/商机",
"招商/渠道",
"合约/租赁合同新签",
"合约/租赁合同变更",
"合约/租赁合同提前终止",
"合约/销售合同新签",
"合约/销售合同变更",
"合约/租赁合同",
"合约/销售合同",
"合约/应收统计"
]
},
{
"name": "role006",
"title": "客服人员",
"description": "直接面向企业或个人的第一窗口，可以对合同进行费用新增",
"roleGroup": "roleGroup01",
"privilegeNames":
[
],
"privilegeGroupNames":
[
"资产/租控图",
"合约/租赁合同新签",
"合约/租赁合同变更",
"合约/租赁合同",
"合约/租赁合同退租确认",
"合约/租赁验房"
]
},
{
"name": "role04001",
"title": "物业管理员",
"description": "负责接收物业报修并受理，管理园区水电",
"roleGroup": "roleGroup04",
"privilegeNames":
[
],
"privilegeGroupNames":
[
"物业/报修单",
"物业/受理单",
"物业/回访单",
"物业/标准水价",
"物业/标准电价",
"物业/水表管理",
"物业/电表管理",
"物业/租客水表设置",
"物业/租客电表设置",
"物业/水表抄表",
"物业/电表抄表",
"物业/水费单",
"物业/电费单",
"物业/设备管理",
"物业/设备间管理",
"物业/服务商管理",
"物业/保养记录",
"物业/安保巡检",
"物业/保洁巡检",
"物业/巡检记录",
"物业/质检记录",
"物业/设备间巡检记录",
"物业/物业地图"
]
},
{
"name": "role04002",
"title": "能源物业人员",
"description": "负责接收物业报修并受理，管理园区水电",
"roleGroup": "roleGroup04",
"privilegeNames":
[
],
"privilegeGroupNames":
[
"物业/水表抄表",
"物业/电表抄表",
"物业/水费单",
"物业/电费单"
]
},
{
"name": "role04003",
"title": "巡检物业人员",
"description": "负责安防巡检及保洁巡检，提交报修",
"roleGroup": "roleGroup04",
"privilegeNames":
[
],
"privilegeGroupNames":
[
"物业/安保巡检",
"物业/保洁巡检"
]
},
{
"name": "role04004",
"title": "工程物业人员",
"description": "负责接收物业报修并受理，进行物业维保及巡检",
"roleGroup": "roleGroup04",
"privilegeNames":
[
],
"privilegeGroupNames":
[
"物业/报修单",
"物业/受理单",
"物业/保养记录",
"物业/巡检记录",
"物业/质检记录"
]
},
{
"name": "role04005",
"title": "值班人员",
"description": "负责接收物业报修并受理",
"roleGroup": "roleGroup04",
"privilegeNames":
[
],
"privilegeGroupNames":
[
"物业/报修单",
"物业/受理单"
]
},
{
"name": "role007",
"title": "出纳人员",
"description": "录入收款单及付款单",
"roleGroup": "roleGroup02",
"privilegeNames":
[
],
"privilegeGroupNames":
[
"合约/租赁合同",
"合约/租赁合同新签",
"合约/租赁合同变更",
"财务/应收统计",
"财务/摊销列表",
"财务/欠租统计",
"财务/通用账单",
"财务/缴款通知书",
"财务/催款通知书",
"财务/调整单",
"财务/收款单",
"财务/收款查询（费用项目）",
"财务/收款查询（缴费方式）",
"财务/通用收款",
"合约/往来款",
"财务/付款单",
"财务/结算"
]
},
{
"name": "role008",
"title": "会计人员",
"description": "审核收付款单",
"roleGroup": "roleGroup02",
"privilegeNames":
[
],
"privilegeGroupNames":
[
"合约/租赁合同",
"合约/租赁合同新签",
"合约/租赁合同变更",
"财务/应收统计",
"财务/摊销列表",
"财务/欠租统计",
"财务/通用账单",
"财务/缴款通知书",
"财务/催款通知书",
"财务/调整单",
"财务/收款单",
"财务/收款查询（费用项目）",
"财务/收款查询（缴费方式）",
"财务/通用收款",
"合约/往来款",
"财务/通用付款",
"财务/付款单",
"财务/结算"
]
},
{
"name": "role009",
"title": "运营人员",
"description": "对企业服务进行操作",
"roleGroup": "roleGroup01",
"privilegeNames":
[
],
"privilegeGroupNames":
[
]
}
]
backend/inz.init.data/src/main/resources/com/beecode/inz/basis/auth/RoleGroup.json
[
{
"name":"roleGroup01",
"title":"业务角色",
"description":"与业务处理相关的角色分组"
},
{
"name":"roleGroup02",
"title":"财务角色",
"description":"与财务处理相关的角色分组"
},
{
"name":"roleGroup04",
"title":"物业角色",
"description":"与物业相关的角色分组"
},
{
"name":"roleGroup03",
"title":"自定义角色",
"description":"自定义角色分组"
},
{
"name":"roleGroup04",
"title":"物业角色",
"description":"与物业相关的角色分组"
}
]
\ No newline at end of file
backend/settings.gradle
......@@ -16,4 +16,5 @@ include "xyst.dinas.production"
include "xyst.dinas.contract"
include "xyst.dinas.camera"
include "xyst.dinas.sales"
include "xyst.dinas.finance"
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/config/DinasCommonConfiguration.java
......@@ -3,6 +3,7 @@ package com.xyst.dinas.biz.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.xyst.dinas.biz.init.PlanningCycleInit;
import com.xyst.dinas.biz.internal.dao.PlanningCycleDao;
import com.xyst.dinas.biz.internal.service.PlanningCycleServiceImpl;
import com.xyst.dinas.biz.service.PlanningCycleService;
......@@ -61,8 +62,14 @@ public class DinasCommonConfiguration {
public PlanningCycleDao planningCycleDao() {
return new PlanningCycleDao();
}
@Bean
public PlanningCycleService planningCycleService() {
return new PlanningCycleServiceImpl();
}
@Bean
public PlanningCycleInit planningCycleInit() {
return new PlanningCycleInit();
}
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/init/PlanningCycleInit.java 0 → 100644
package com.xyst.dinas.biz.init;
import javax.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
import com.xyst.dinas.biz.service.PlanningCycleService;
public class PlanningCycleInit {
@Autowired
private PlanningCycleService planningCycleService;
@PostConstruct
private void init() {
planningCycleService.initData();
}
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/PlanningCycleDao.java
package com.xyst.dinas.biz.internal.dao;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import javax.annotation.PostConstruct;
import javax.transaction.Transactional;
import org.hibernate.query.Query;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -84,9 +79,13 @@ public class PlanningCycleDao {
});
}
@SuppressWarnings("deprecation")
public List<KObject> getPlanningCycleListByDay(Date startTime,Date endTime) {
String dayName = PlanningCycleEnum.DAY.name();
endTime.setHours(23);
endTime.setMinutes(59);
endTime.setSeconds(59);
String hql = "from "+PlanningCycleConstant.ENTITY+" where cycleType=:cycleType and startTime >=:startTime and endTime <=:endTime";
return template.execute(session -> {
......@@ -118,7 +117,7 @@ public class PlanningCycleDao {
for (LocalDateTime date = startDate; date.compareTo(endDate)<0; date = date.plusDays(1)) {
KObject obj = kClass.newInstance();
obj.set("cycleType", dayType);
obj.set("title", date.format(DateTimeFormatter.ISO_LOCAL_DATE));
obj.set("title", formatDateForDay(date));
obj.set("startTime", date);
obj.set("endTime", date.plusDays(1).minusSeconds(1));
template.save(obj);
......@@ -128,7 +127,7 @@ public class PlanningCycleDao {
for (LocalDateTime date = startDate; date.compareTo(endDate)<0; date = date.plusWeeks(1)) {
KObject obj = kClass.newInstance();
obj.set("cycleType", weekType);
String title=date.format(DateTimeFormatter.ISO_LOCAL_DATE) +" - "+date.plusWeeks(1).minusDays(1).format(DateTimeFormatter.ISO_LOCAL_DATE);
String title= formatDateForDay(date) +"-"+formatDateForDay(date.plusWeeks(1).minusDays(1));
obj.set("title", title);
obj.set("startTime", date);
obj.set("endTime", date.plusWeeks(1).minusSeconds(1));
......@@ -139,4 +138,13 @@ public class PlanningCycleDao {
logger.error("初始化计划周期数据发生异常!");
}
}
private String formatDateForDay(LocalDateTime date) {
int year = date.getYear();
int monthValue = date.getMonthValue();
int dayOfMonth = date.getDayOfMonth();
return year+"年"+monthValue+"月"+dayOfMonth+"日";
}
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/PlanningCycleServiceImpl.java
package com.xyst.dinas.biz.internal.service;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
......@@ -38,7 +37,7 @@ public class PlanningCycleServiceImpl implements PlanningCycleService{
* @param endTime
* @return
*/
public List<KObject> getPlanningCycleListByDay(LocalDateTime startTime,LocalDateTime endTime) {
public List<KObject> getPlanningCycleListByDay(Date startTime,Date endTime) {
return planningCycleDao.getPlanningCycleListByDay(startTime, endTime);
}
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/service/PlanningCycleService.java
package com.xyst.dinas.biz.service;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
......@@ -25,7 +24,7 @@ public interface PlanningCycleService {
* @param endTime
* @return
*/
public List<KObject> getPlanningCycleListByDay(LocalDateTime startTime,LocalDateTime endTime) ;
public List<KObject> getPlanningCycleListByDay(Date startTime,Date endTime) ;
public void initData() ;
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/DinasCommonController.java
package com.xyst.dinas.biz.web;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
......@@ -94,7 +93,8 @@ public class DinasCommonController {
* @return
*/
@GetMapping("/planningCycleListByDay/{startTime}/{endTime}")
public List<KObject> getPlanningCycleListByDay(@PathVariable LocalDateTime startTime,@PathVariable LocalDateTime endTime) {
public List<KObject> getPlanningCycleListByDay(@DateTimeFormat(pattern = "yyyy-MM-dd") @PathVariable Date startTime,
@DateTimeFormat(pattern = "yyyy-MM-dd") @PathVariable Date endTime) {
return planningCycleService.getPlanningCycleListByDay(startTime, endTime);
}
}
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization$sequence.jmx
<?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>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization$serial.jmx
<?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>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization.jmx
<?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>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$sequence.jmx
<?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>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$serial.jmx
<?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>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position.jmx
<?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>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$sequence.jmx
<?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>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$serial.jmx
<?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>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo.jmx
<?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>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$sequence.jmx
<?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>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$serial.jmx
<?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>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station.jmx
<?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>
......
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/dao/ContractDao.java
......@@ -11,6 +11,7 @@ import org.hibernate.Session;
import org.hibernate.query.Query;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.lang.Nullable;
import org.springframework.orm.hibernate5.HibernateCallback;
import org.springframework.orm.hibernate5.HibernateOperations;
......@@ -91,23 +92,41 @@ public class ContractDao {
}
/**
* 查询区域公司下所有执行中的合同
* @param infoid
* 查询指定时间范围内有效的执行中合同
*
* @param regionCompanyId 区域公司
* @param startDate 开始时间
* @param endDate 结束时间
* @return
*/
public List<KObject> getExecutingContractByRegionCompany(UUID regionCompanyId) {
public List<KObject> queryExeContractListInLife(UUID regionCompanyId,@Nullable Date startDate,@Nullable Date endDate){
return (List<KObject>)template.execute(new HibernateCallback<List<KObject>>() {
@Override
public List<KObject> doInHibernate(Session session) throws HibernateException {
Query<KObject> query = session.createQuery("from " + ContractConstant.ENTITY_CONTRACT + " where (discard is null or discard = 0) and regionCompany.id =:regionCompanyId and contractState =:contractState", KObject.class);
StringBuilder hql = new StringBuilder("from " + ContractConstant.ENTITY_CONTRACT + " where (discard is null or discard = 0) and regionCompany.id =:regionCompanyId and contractState =:contractState ");
if(startDate!=null) hql.append(" and startDate <=:startDate");
if(endDate!=null) hql.append(" and endDate >=:endDate");
Query<KObject> query = session.createQuery(hql.toString(), KObject.class);
query.setParameter("regionCompanyId", regionCompanyId);
query.setParameter("contractState", ContractStateEnum.EXECUTING.name());
if(startDate!=null) query.setParameter("startDate", startDate);
if(endDate!=null) query.setParameter("endDate", endDate);
return query.getResultList();
}
});
}
/**
* 查询区域公司下所有执行中的合同
* @param infoid
* @return
*/
public List<KObject> queryExeContractByRegionCompany(UUID regionCompanyId) {
return queryExeContractListInLife(regionCompanyId, null, null);
}
/**
* 合同统计查询
* @param contractStatisticsQuery
* @return
......@@ -187,5 +206,5 @@ public class ContractDao {
return dinasAmount;
}
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/service/ContractServiceImpl.java
......@@ -11,6 +11,7 @@ import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -340,5 +341,8 @@ public class ContractServiceImpl implements ContractService {
contractDao.update(kobject);
}
public List<KObject> queryExeContractListInLife(UUID regionCompanyId,@Nullable Date startDate,@Nullable Date endDate){
return contractDao.queryExeContractListInLife(regionCompanyId, startDate, endDate);
}
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/service/ContractService.java
package com.xyst.dinas.contract.service;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import org.json.JSONArray;
import org.springframework.lang.Nullable;
import com.beecode.bcp.type.KObject;
......@@ -87,5 +89,7 @@ public interface ContractService {
* @param object afterApprovedForUpdate
*/
void afterApprovedForUpdate(KObject object);
public List<KObject> queryExeContractListInLife(UUID regionCompanyId,@Nullable Date startDate,@Nullable Date endDate);
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/web/ContractController.java
package com.xyst.dinas.contract.web;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
......@@ -9,6 +10,7 @@ import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -234,8 +236,20 @@ public class ContractController {
*/
@GetMapping("/contract/queryWarnSettingStaffByContractId/{contractId}")
public Object queryWarnSettingStaffByContractId(@PathVariable String contractId) {
Assert.notNull(contractId,"The id must not be null");
Assert.notNull(contractId,"The contractId must not be null");
return contractService.queryWarnSettingStaffByContractId(contractId);
}
/**
* 查询某区域公司下执行中的合同(指定时间范围内有效的)
* @param regionCompanyId
* @param startDate
* @param endDate
* @return
*/
@GetMapping("/contract/exeContractListInLife/{regionCompanyId}/{startDate}/{endDate}")
public List<KObject> queryExeContractListInLife(@PathVariable UUID regionCompanyId,
@DateTimeFormat(pattern="yyyy-MM-dd") @PathVariable Date startDate,@DateTimeFormat(pattern="yyyy-MM-dd") @PathVariable Date endDate){
return contractService.queryExeContractListInLife(regionCompanyId, startDate, endDate);
}
}
\ No newline at end of file
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill$sequence.jmx
<?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>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill$serial.jmx
<?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>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill.jmx
<?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>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/datamodel/Contract$contractDetail.jmx
......@@ -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>
......
backend/xyst.dinas.finance/build.gradle 0 → 100644
dependencies {
compile lib.bcp_import
compile lib.bcp_type
compile lib.bcp_store
compile lib.hibernate_core
compile lib.spring_web
compile lib.spring_boot_autoconfigure
compile lib.jackson_datatype_jdk8
compile lib.jackson_datatype_jsr310
compile lib.json
compile "com.beecode:bap2.participant:${aminoVersion}"
compile "com.beecode:bcp.org:${aminoVersion}"
compile "com.beecode:bap2.department:${aminoVersion}"
compile "com.beecode:bap2.staff:${aminoVersion}"
compile 'com.deepoove:poi-tl:1.5.0'
compile project(":inz.common")
compile project(":inz.query")
compile project(":inz.workflow")
compile project(":inz.basis")
compile project(":xyst.dinas.biz")
testCompile lib.amino_boot_web
testCompile lib.mysql_connector
}
backend/xyst.dinas.finance/settings.gradle 0 → 100644
rootProject.name = 'xyst.dinas.finance'
\ No newline at end of file
backend/xyst.dinas.finance/src/main/java/com/xyst/dinas/finance/config/FinanceConfiguration.java 0 → 100644
package com.xyst.dinas.finance.config;
public class FinanceConfiguration {
}
backend/xyst.dinas.finance/src/main/resources/META-INF/spring.factories 0 → 100644
# Auto Configure
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.xyst.dinas.finance.config.FinanceConfiguration
\ No newline at end of file
backend/xyst.dinas.finance/src/test/resources/config/persistence.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util" xmlns:jee="http://www.springframework.org/schema/jee"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.0.xsd
http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.0.xsd">
<!-- 数据库映射 -->
<bean id="dataSource"
class="org.springframework.jdbc.datasource.DriverManagerDataSource">
<property name="driverClassName" value="${jdbc.driverClassName}" />
<property name="url" value="${jdbc.url}" />
<property name="username" value="${jdbc.user}" />
<property name="password" value="${jdbc.pass}" />
</bean>
<bean id="sessionFactory"
class="com.beecode.bcp.store.hibernate.HibernateSessionFactoryBean"
scope="metadata" lazy-init="true">
<property name="dataSource" ref="dataSource" />
<property name="mappingLocations">
<list>
<value>classpath*:/**/*.hbm.xml</value>
</list>
</property>
<property name="packagesToScan">
<list>
<value>com.beecode.amino.test.war.entity</value>
<value>com.beecode.inz.authmgr.**.*</value>
<value>com.beecode.bap.scheduler.entity</value>
</list>
</property>
<property name="hibernateProperties">
<props>
<prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
<prop key="hibernate.dialect">${hibernate.dialect}</prop>
<prop key="hibernate.show_sql">${hibernate.show_sql}</prop>
</props>
</property>
</bean>
<!-- 配置Hibernate事务管理器 -->
<bean id="transactionManager"
class="com.beecode.bcp.store.hibernate.HibernateTransactionManager">
<property name="sessionFactoryName" value="sessionFactory" />
</bean>
<!-- 配置Hibernate模板 -->
<bean id="hibernateOperations"
class="com.beecode.bcp.store.hibernate.HibernateTemplate">
<property name="sessionFactoryName" value="sessionFactory" />
</bean>
<!-- 配置事务异常封装 -->
<bean id="persistenceExceptionTranslationPostProcessor"
class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor" />
</beans>
\ No newline at end of file
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$sequence.jmx
<?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>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$serial.jmx
<?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>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply.jmx
<?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>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$sequence.jmx
<?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>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$serial.jmx
<?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>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument.jmx
<?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>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$sequence.jmx
<?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>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$serial.jmx
<?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>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow.jmx
<?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>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$sequence.jmx
<?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>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$serial.jmx
<?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>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply.jmx
<?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>
......
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/ProjectFiled$sequence.jmx
<?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>
......
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/ProjectFiled$serial.jmx
<?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>
......
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/ProjectFiled.jmx
<?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>
......
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/PurchaseSandCompany$sequence.jmx
<?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>
......
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/PurchaseSandCompany$serial.jmx
<?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>
......
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/PurchaseSandCompany.jmx
<?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>
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/config/SalesConfiguration.java
......@@ -2,20 +2,41 @@ 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;
public class SalesConfiguration {
@Bean
public InventoryController inventoryController() {
return new InventoryController();
}
@Bean
public InventoryService inventoryService() {
return new InventoryServiceImpl();
}
@Bean
public InventoryDao inventoryDao() {
return new InventoryDaoImpl();
}
/***********销售计划******************/
@Bean
public SalesPlanController salesPlanController() {
return new SalesPlanController();
......@@ -34,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();
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/constant/InventoryConstant.java 0 → 100644
package com.xyst.dinas.sales.constant;
public interface InventoryConstant {
public static String INVENTORY_ENTITY = "com.xyst.dinas.sales.datamodel.Inventory";
public static String LOG_ENTITY = "com.beecode.bap.log.datamodel.Log";
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/constant/NeedPlanConstant.java
......@@ -6,4 +6,8 @@ public interface NeedPlanConstant {
* 实体名
*/
String NEED_PLAN_NTITY = "com.xyst.dinas.sales.datamodel.NeedPlan";
/**
* 需用计划量
*/
String needPlanAmount = "needPlanAmount";
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/constant/SalesPlanConstant.java
......@@ -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";
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/InventoryDao.java 0 → 100644
package com.xyst.dinas.sales.dao;
import java.util.List;
import java.util.UUID;
import com.beecode.bcp.type.KObject;
public interface InventoryDao {
List<KObject> listAllByRegionalCompany(UUID regionalCompany, boolean includeDiscard);
void update(KObject kobj);
void save(KObject kobj);
KObject getItemByStationIdAndDinasTypeId(UUID stationId, UUID dinasTypeId);
List<KObject> queryLog(List<String> businessObjectId);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/SalesPlanDao.java
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);
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/entity/InventoryLog.java 0 → 100644
package com.xyst.dinas.sales.entity;
public class InventoryLog {
/*
* 纠正时间
*/
private String time;
/**
* 操作人
*/
private String operator;
/**
* 日志内容
*/
private String content;
public InventoryLog() {
}
public InventoryLog(String time, String operator, String content) {
this.time = time;
this.operator = operator;
this.content = content;
}
public String getTime() {
return time;
}
public void setTime(String time) {
this.time = time;
}
public String getOperator() {
return operator;
}
public void setOperator(String operator) {
this.operator = operator;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/entity/StationDinasTypeRelation.java 0 → 100644
package com.xyst.dinas.sales.entity;
import java.math.BigDecimal;
import java.util.UUID;
public class StationDinasTypeRelation {
/*
* 场站id
*/
private UUID stationId;
/**
* 场站名称
*/
private String stationName;
/*
* 砂石类型id
*/
private UUID dinasTypeId;
/**
* 砂石类型名称
*/
private String dinasTypeName;
/*
* 砂石单价
*/
private BigDecimal price;
/**
* 库存量
*/
private BigDecimal amount;
public StationDinasTypeRelation() {
}
public StationDinasTypeRelation(UUID stationId, UUID dinasTypeId, BigDecimal price) {
this.stationId = stationId;
this.dinasTypeId = dinasTypeId;
this.price = price;
}
public UUID getStationId() {
return stationId;
}
public void setStationId(UUID stationId) {
this.stationId = stationId;
}
public UUID getDinasTypeId() {
return dinasTypeId;
}
public void setDinasTypeId(UUID dinasTypeId) {
this.dinasTypeId = dinasTypeId;
}
public BigDecimal getPrice() {
return price;
}
public void setPrice(BigDecimal price) {
this.price = price;
}
public BigDecimal getAmount() {
return amount;
}
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
public String getStationName() {
return stationName;
}
public void setStationName(String stationName) {
this.stationName = stationName;
}
public String getDinasTypeName() {
return dinasTypeName;
}
public void setDinasTypeName(String dinasTypeName) {
this.dinasTypeName = dinasTypeName;
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/enumeration/transportModeEnum.java 0 → 100644
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;
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/dao/InventoryDaoImpl.java 0 → 100644
package com.xyst.dinas.sales.internal.dao;
import java.util.List;
import java.util.UUID;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.query.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.hibernate5.HibernateCallback;
import org.springframework.orm.hibernate5.HibernateOperations;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.sales.constant.InventoryConstant;
import com.xyst.dinas.sales.dao.InventoryDao;
public class InventoryDaoImpl implements InventoryDao {
@Autowired
private HibernateOperations template;
@Override
public List<KObject> listAllByRegionalCompany(UUID regionalCompany, boolean includeDiscard) {
return (List<KObject>)template.execute(new HibernateCallback<List<KObject>>() {
@Override
public List<KObject> doInHibernate(Session session) throws HibernateException {
if(includeDiscard) {
Query<KObject> query = session.createQuery("from " + InventoryConstant.INVENTORY_ENTITY + " where regionalCompany.id =:regionalCompany", KObject.class);
query.setParameter("regionalCompany", regionalCompany);
return query.getResultList();
} else {
Query<KObject> query = session.createQuery("from " + InventoryConstant.INVENTORY_ENTITY + " where (discard is null or discard = 0) and regionalCompany.id =:regionalCompany", KObject.class);
query.setParameter("regionalCompany", regionalCompany);
return query.getResultList();
}
}
});
}
@Override
public void update(KObject kobj) {
template.update(kobj);
}
@Override
public void save(KObject kobj) {
template.save(kobj);
}
@Override
public KObject getItemByStationIdAndDinasTypeId(UUID stationId, UUID dinasTypeId) {
return (KObject)template.execute(new HibernateCallback<KObject>() {
@Override
public KObject doInHibernate(Session session) throws HibernateException {
Query<KObject> query = session.createQuery("from " + InventoryConstant.INVENTORY_ENTITY + " where (discard is null or discard = 0) and station.id =:stationId and dinasType.id =:dinasTypeId", KObject.class);
query.setParameter("stationId", stationId);
query.setParameter("dinasTypeId", dinasTypeId);
return query.getSingleResult();
}
});
}
@Override
public List<KObject> queryLog(List<String> businessObjectId) {
return (List<KObject>)template.execute(new HibernateCallback<List<KObject>>() {
@Override
public List<KObject> doInHibernate(Session session) throws HibernateException {
Query<KObject> query = session.createQuery("from " + InventoryConstant.LOG_ENTITY + " where module = :module and businessObjectId in (:businessObjectId) order by time desc", KObject.class);
query.setParameter("module", InventoryConstant.INVENTORY_ENTITY);
query.setParameter("businessObjectId", businessObjectId);
return query.getResultList();
}
});
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/dao/NeedPlanDaoImpl.java
......@@ -29,7 +29,9 @@ public class NeedPlanDaoImpl implements NeedPlanDao, NeedPlanConstant {
query.setParameter("planningCycleId", planningCycleId);
query.setParameter("contractId", contractId);
query.setParameter("submitState", "SUBMITTED");
return query.getResultList().get(0);
List<KObject> resultList = query.getResultList();
if(resultList.isEmpty()) return null;
return resultList.get(0);
}
});
}
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/InventoryServiceImpl.java 0 → 100644
package com.xyst.dinas.sales.internal.service;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import javax.transaction.Transactional;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import com.beecode.amino.common.ValueConvertException;
import com.beecode.amino.core.Amino;
import com.beecode.bap.log.service.LogService;
import com.beecode.bap.staff.BapContext;
import com.beecode.bap.staff.service.StaffService;
import com.beecode.bcp.type.AttributeNotFoundException;
import com.beecode.bcp.type.KClass;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.xyst.dinas.biz.service.DinasOrganizationService;
import com.xyst.dinas.biz.service.DinasTypeService;
import com.xyst.dinas.biz.service.StationService;
import com.xyst.dinas.sales.constant.InventoryConstant;
import com.xyst.dinas.sales.dao.InventoryDao;
import com.xyst.dinas.sales.entity.InventoryLog;
import com.xyst.dinas.sales.entity.StationDinasTypeRelation;
import com.xyst.dinas.sales.service.InventoryService;
public class InventoryServiceImpl implements InventoryService {
@Autowired
public StationService stationService;
@Autowired
public DinasTypeService dinasTypeService;
@Autowired
public DinasOrganizationService dinasOrganizationService;
@Autowired
public LogService logService;
@Autowired
public StaffService staffService;
@Autowired
public InventoryDao inventoryDao;
@Autowired
public BapContext bapContext;
@Override
@Transactional
public List<StationDinasTypeRelation> getInventoryByRegionalCompany(UUID regionalCompany) {
updateInventoryBaseInfo(regionalCompany);
List<KObject> inventory = inventoryDao.listAllByRegionalCompany(regionalCompany, false);
List<StationDinasTypeRelation> result = new ArrayList<StationDinasTypeRelation>();
for(KObject item : inventory) {
StationDinasTypeRelation r = new StationDinasTypeRelation();
r.setStationId(item.get("station").getUuid("id"));
r.setStationName(item.get("station").getString("stationName"));
r.setDinasTypeId(item.get("dinasType").getUuid("id"));
r.setDinasTypeName(item.get("dinasType").getString("dinasTypeName"));
r.setAmount(item.getBigDecimal("amount"));
r.setPrice(item.getBigDecimal("price"));
result.add(r);
}
return result;
}
/**
* body json格式数据
* isLog 是否记录修改日志
* autoCalculate 是否是自增或自减
*/
@SuppressWarnings("unchecked")
@Override
@Transactional
public ResponseObj<String> modifyInventory(String body, boolean isLog, boolean autoCalculate) {
JSONObject params = new JSONObject(body);
JSONArray datas = params.getJSONArray("datas");
for(int j = 0; j < datas.length(); j++) {
JSONObject param = datas.getJSONObject(j);
String regionalCompany = param.getString("regionalCompany");
if(null != regionalCompany) {
updateInventoryBaseInfo(UUID.fromString(regionalCompany));
//根据body数据赋值修正后的库存量
JSONArray data = param.getJSONArray("data");
for(int i = 0; i < data.length(); i++) {
JSONObject item = data.getJSONObject(i);
String stationId = item.getString("stationId");
String stationName = item.getString("stationName");
String dinasTypeId = item.getString("dinasTypeId");
String dinasTypeName = item.getString("dinasTypeName");
double amount = item.getDouble("amount");
KObject kobj = inventoryDao.getItemByStationIdAndDinasTypeId(UUID.fromString(stationId), UUID.fromString(dinasTypeId));
double oldAmount = kobj.getDouble("amount");
if(autoCalculate) {
BigDecimal addParam2 = new BigDecimal(oldAmount);
BigDecimal addParam1 = new BigDecimal(amount);
kobj.set("amount", addParam2.add(addParam1).doubleValue());
} else {
kobj.set("amount", amount);
}
inventoryDao.update(kobj);
if(isLog) {
try {
KObject log = Amino.getApplicationMetadataContext().getBean(InventoryConstant.LOG_ENTITY, KClass.class).newInstance();
log.set("id", UUID.randomUUID());
log.set("module", InventoryConstant.INVENTORY_ENTITY);
log.set("businessObjectId", kobj.getUuid("id").toString());
log.set("logContent", stationName + "的" + dinasTypeName + "库存量由" + oldAmount + "变为" + amount);
log.set("time", new Date());
log.set("loglevel", "INFO");
log.set("staffId", bapContext.getCurrentStaff().getUuid("id"));
log.set("deptId", bapContext.getCurrentStaff().get("department").getUuid("id"));
logService.addLog(log);
} catch (AttributeNotFoundException e) {
e.printStackTrace();
} catch (ValueConvertException e) {
e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
}
return ResponseObj.success("库存更新成功");
}
public void updateInventoryBaseInfo(UUID regionalCompany) {
List<StationDinasTypeRelation> relation = getStationAndDinasTypeRel(regionalCompany);
//根据最新的场站与砂石对应关系，更新库中的数据。添加新的砂石类型，废弃没用的砂石类型
List<KObject> inventory = inventoryDao.listAllByRegionalCompany(regionalCompany, true);
for(StationDinasTypeRelation r : relation) {
UUID stationId = r.getStationId();
UUID dinasTypeId = r.getDinasTypeId();
BigDecimal price = r.getPrice();
boolean findFlag = false;
for(KObject i : inventory) {
if(i.get("station").getUuid("id").equals(stationId) && i.get("dinasType").getUuid("id").equals(dinasTypeId)) {
findFlag = true;
i.set("price", price); //赋值最新砂价
i.set("discard", false); //赋值未废弃
inventoryDao.update(i);
break;
}
}
//未找到，则新增
if(!findFlag) {
KObject item = Amino.getApplicationMetadataContext().getBean(InventoryConstant.INVENTORY_ENTITY, KClass.class).newInstance();
item.set("id", UUID.randomUUID());
item.set("regionalCompany", dinasOrganizationService.load(regionalCompany));
item.set("station", stationService.getById(stationId));
item.set("dinasType", dinasTypeService.getById(dinasTypeId));
item.set("amount", 0);
item.set("price", price);
inventoryDao.save(item);
}
}
//处理那些已经不再销售的砂石
for(KObject i : inventory) {
UUID stationId = i.get("station").getUuid("id");
UUID dinasTypeId = i.get("dinasType").getUuid("id");
boolean findFlag = false;
for(StationDinasTypeRelation r : relation) {
if(r.getStationId().equals(stationId) && r.getDinasTypeId().equals(dinasTypeId)) {
findFlag = true;
break;
}
}
if(!findFlag) {
i.set("amount", 0); //库存量置空
i.set("price", 0); //砂价置空
i.set("discard", true); //转为废弃
inventoryDao.update(i);
}
}
}
//查询最新的场站与砂石类型对应关系
public List<StationDinasTypeRelation> getStationAndDinasTypeRel(UUID regionalCompany) {
List<StationDinasTypeRelation> relation = new ArrayList<StationDinasTypeRelation>();
List<KObject> stationList;
try {
stationList = stationService.listStationInfoByRegionalCompany(regionalCompany);
for(KObject station : stationList) {
List<KObject> dinasTypeList = dinasTypeService.getByStation(station.getUuid("id"));
//TODO：带出今日砂价
for(KObject dinasType : dinasTypeList) {
StationDinasTypeRelation item = new StationDinasTypeRelation(station.getUuid("id"), dinasType.getUuid("id"), new BigDecimal(0));
relation.add(item);
}
}
} catch (Exception e) {
e.printStackTrace();
}
return relation;
}
@Override
public List<InventoryLog> queryLog(UUID regionalCompany) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
List<InventoryLog> result = new ArrayList<InventoryLog>();
List<KObject> inventory = inventoryDao.listAllByRegionalCompany(regionalCompany, false);
List<String> businessObjectId = new ArrayList<String>();
for(KObject i : inventory) {
businessObjectId.add(i.getUuid("id").toString());
}
List<KObject> logList = inventoryDao.queryLog(businessObjectId);
for(KObject log : logList) {
KObject operator = staffService.getById(log.getUuid("staffId"));
InventoryLog item = new InventoryLog();
item.setTime(format.format(log.getDate("time")));
item.setOperator(operator.getString("name"));
item.setContent(log.getString("logContent"));
result.add(item);
}
return result;
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/NeedPlanServiceImpl.java
......@@ -20,9 +20,10 @@ public class NeedPlanServiceImpl implements NeedPlanService {
@Override
public KObject queryNeedPlanAmountByDinasType(UUID planningCycleId,UUID contractId, UUID dinasTypeId) {
KObject kObject = null;
KObject needPlan = needPlanDao.queryNeedPlanByContractIdAndCycleId(planningCycleId, contractId);
if(needPlan==null) return null;
List<KObject> needPlanDetailsList = needPlan.get("NeedPlanDetails").toList();
KObject kObject = null;
if (needPlanDetailsList.size() > 0) {
kObject = needPlanDetailsList.stream().filter(detail -> detail.get("dinasType").getUuid("id").equals(dinasTypeId)).findAny().orElse(null);
}
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesPlanServiceImpl.java
......@@ -7,6 +7,7 @@ import java.util.UUID;
import javax.transaction.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.lang.Nullable;
import com.beecode.amino.core.Amino;
import com.beecode.bap.workflow.core.BizProcessState;
......@@ -14,14 +15,24 @@ import com.beecode.bcp.type.KClass;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.common.BaseConstants;
import com.xyst.dinas.contract.constant.ContractConstant;
import com.xyst.dinas.sales.constant.NeedPlanConstant;
import com.xyst.dinas.sales.constant.SalesPlanConstant;
import com.xyst.dinas.sales.dao.SalesPlanDao;
import com.xyst.dinas.sales.service.NeedPlanService;
import com.xyst.dinas.sales.service.SalesPlanService;
/**
* 销售计划
*
* @author Jackpot
* @date 2021年4月13日
*/
@Transactional
public class SalesPlanServiceImpl implements SalesPlanService{
@Autowired
private SalesPlanDao salesPlanDao;
@Autowired
private NeedPlanService needPlanService;
@Transactional
public int createSalesPlanDetail(KObject salesPlan, KObject contract) {
......@@ -30,16 +41,16 @@ public class SalesPlanServiceImpl implements SalesPlanService{
UUID contractId = contract.getUuid(BaseConstants.ID);
String contractName = contract.getString("contractName");
KObject project = contract.get("project");
UUID projectId = project.getUuid(BaseConstants.ID);
KObject purchaseSandUnit = contract.get("purchaseSandUnit");
UUID purchaseSandUnitId = purchaseSandUnit.getUuid(BaseConstants.ID);
KClass detailClass = Amino.getApplicationMetadataContext().getBean(SalesPlanConstant.ENTITY_DETAIL, KClass.class);
List<KObject> contractDetail = contract.get("contractDetails").toList();
for (KObject detail : contractDetail) {//合同中的砂石明细
double contractAmount = detail.getDouble(ContractConstant.DINAS_AMOUNT);//合同上的砂石余量
KObject dinasType = detail.get("dinasType");
double contractAmount = detail.getDouble(ContractConstant.DINAS_AMOUNT); //合同上的砂石余量
double requiredAmount= 0D;//需用量
UUID dinasTypeId = dinasType.getUuid(BaseConstants.ID);
UUID planningCycleId = salesPlan.get("planningCycle").getUuid(BaseConstants.ID);
KObject needPlanDetail = needPlanService.queryNeedPlanAmountByDinasType(planningCycleId, contractId, dinasTypeId);
double requiredAmount= needPlanDetail!=null?needPlanDetail.getDouble(NeedPlanConstant.needPlanAmount):0D;//需用量
Double planAmount = null;//本期分配量
//新增销售计划明细
KObject planDetailObj = detailClass.newInstance();
......@@ -73,4 +84,36 @@ public class SalesPlanServiceImpl implements SalesPlanService{
return kObject;
}
public void deleteSalesPlan(KObject salesPlan) {
salesPlanDao.delete(salesPlan);
}
public int deleteSalesPlanDetails(UUID masterId, @Nullable UUID contractId) {
return salesPlanDao.deleteDetails(masterId, contractId);
}
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);
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/processor/SalesPlanTempProcessor.java 0 → 100644
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);
}
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/InventoryService.java 0 → 100644
package com.xyst.dinas.sales.service;
import java.util.List;
import java.util.UUID;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.xyst.dinas.sales.entity.InventoryLog;
import com.xyst.dinas.sales.entity.StationDinasTypeRelation;
public interface InventoryService {
public List<StationDinasTypeRelation> getInventoryByRegionalCompany(UUID regionalCompany);
public ResponseObj<String> modifyInventory(String body, boolean isLog, boolean autoCalculate);
public List<InventoryLog> queryLog(UUID regionalCompany);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/NeedPlanService.java
package com.xyst.dinas.sales.service;
import java.util.Map;
import java.util.UUID;
import com.beecode.bcp.type.KObject;
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/SalesPlanService.java
package com.xyst.dinas.sales.service;
import java.util.UUID;
import org.springframework.lang.Nullable;
import com.beecode.bcp.type.KObject;
public interface SalesPlanService {
......@@ -21,5 +25,17 @@ public interface SalesPlanService {
public int createSalesPlanDetail(KObject salesPlan, KObject contract);
public void deleteSalesPlan(KObject salesPlan) ;
public int deleteSalesPlanDetails(UUID masterId, @Nullable UUID contractId) ;
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);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/task/SalesPlanAutoCreateTask.java
package com.xyst.dinas.sales.task;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
......@@ -66,16 +67,15 @@ public class SalesPlanAutoCreateTask implements Task{
KObject salesPlan = salesPlanDao.querySalesPlanByPlan(regionCompanyId, planningCycleId);
//1. 新增销售计划
if (salesPlan==null) {
List<KObject> executingContracts = contractDao.queryExeContractByRegionCompany(regionCompanyId);
if (executingContracts.isEmpty()) continue;
KObject salesPlanMaster = salesPlanService.createSalesPlanMaster(regionCompany, planningCycleObj);
// UUID masterId = salesPlanMaster.getUuid(BaseConstants.ID);
int detailCount = 0;
List<KObject> executingContracts = contractDao.getExecutingContractByRegionCompany(regionCompanyId);
if (executingContracts.isEmpty()) continue;
for (KObject contract : executingContracts) {//执行中的合同
detailCount += salesPlanService.createSalesPlanDetail(salesPlanMaster, contract);
}
if(detailCount==0) {
salesPlanDao.delete(salesPlanMaster);
salesPlanService.deleteSalesPlan(salesPlanMaster);
logger.info("区域公司["+regionCompanyName+"]:本次没有生成销售计划;");
}else {
int contractSize = executingContracts.size();
......@@ -90,10 +90,10 @@ public class SalesPlanAutoCreateTask implements Task{
continue;
}
//3.更新销售计划
HashSet<KObject> contractForAddInPlan = new HashSet<>();
List<KObject> contractForAddInPlan = new ArrayList<>();
HashSet<UUID> contractForDelInPlan = new HashSet<>();
List<KObject> executingContracts = contractDao.getExecutingContractByRegionCompany(regionCompanyId);
List<KObject> executingContracts = contractDao.queryExeContractByRegionCompany(regionCompanyId);
List<KObject> salesPlanDetails = salesPlan.get("SalesPlanDetails").toList();
for (KObject executingContract : executingContracts) {
......@@ -123,7 +123,7 @@ public class SalesPlanAutoCreateTask implements Task{
UUID salesPlanId = salesPlan.getUuid(BaseConstants.ID);
//3.1 删除部分销售明细
for (UUID contractId : contractForDelInPlan) {
salesPlanDao.deleteDetails(salesPlanId, contractId);
salesPlanService.deleteSalesPlanDetails(salesPlanId, contractId);
}
//3.2 更新销售明细中的合同砂石余量
if(contractForDelInPlan.size()>0) {
......@@ -139,7 +139,7 @@ public class SalesPlanAutoCreateTask implements Task{
double contractAmount = salesPlanDetail.getDouble(SalesPlanConstant.contractAmount);
if(contractDinasAmount == contractAmount) continue;
salesPlanDetail.set(SalesPlanConstant.contractAmount, contractDinasAmount);
salesPlanDao.update(salesPlanDetail);
salesPlanService.update(salesPlanDetail);
updateDetailCount++;
}
//3.3 新增销售明细
......@@ -150,7 +150,6 @@ public class SalesPlanAutoCreateTask implements Task{
+ "删除 "+contractForDelInPlan.size()+" 条销售明细,刷新 "+updateDetailCount+" 条销售明细;");
}
}
private void initService() {
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/task/SalesPlanAutoCreateTaskRegister.java
......@@ -37,9 +37,9 @@ public class SalesPlanAutoCreateTaskRegister implements ServiceInitializer{
}
TaskDetail TaskDetail = new TaskDetail(TASK_NAME, SalesPlanAutoCreateTask.class.getName());
// 每天凌晨12点执行调度，如测试可修改为每十五秒：*/15 * * * * ?（表达式由至少6个由空格分隔的时间元素，从左至右可分为秒，分，时，日，月，星期）
scheduleService.scheduleTask(TaskDetail, "0 0 0 * * ?");
// scheduleService.scheduleTask(TaskDetail, "0 0 0 * * ?");
// 测试调度时进行调用
// scheduleService.scheduleTask(TaskDetail, "*/30 * * * * ?");
scheduleService.scheduleTask(TaskDetail, "*/50 * * * * ?");
logger.info("销售计划自动创建任务初始化成功!");
}
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/InventoryController.java 0 → 100644
package com.xyst.dinas.sales.web;
import java.util.List;
import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.beecode.xlib.runtime.Assert;
import com.xyst.dinas.sales.entity.InventoryLog;
import com.xyst.dinas.sales.entity.StationDinasTypeRelation;
import com.xyst.dinas.sales.service.InventoryService;
@RestController
public class InventoryController {
@Autowired
public InventoryService inventoryService;
//查询库存量
@ResponseBody
@RequestMapping(value = "/inventory/query", method = RequestMethod.GET)
public Object query(@RequestParam("regionalCompany") String regionalCompany) {
Assert.notNull(regionalCompany, "The regionalCompany must not be null");
List<StationDinasTypeRelation> data = inventoryService.getInventoryByRegionalCompany(UUID.fromString(regionalCompany));
return ResponseObj.success("库存查询成功", data);
}
//修改库存量
@ResponseBody
@RequestMapping(value = "/inventory/modify", method = RequestMethod.POST)
public Object modify(@RequestBody String body) {
ResponseObj<String> result = inventoryService.modifyInventory(body, true, false);
return result;
}
//查询库存纠正日志
@ResponseBody
@RequestMapping(value = "/inventory/queryLog", method = RequestMethod.GET)
public Object queryLog(@RequestParam("regionalCompany") String regionalCompany) {
Assert.notNull(regionalCompany, "The regionalCompany must not be null");
List<InventoryLog> data = inventoryService.queryLog(UUID.fromString(regionalCompany));
return ResponseObj.success("库存纠正日志查询成功", data);
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/SalesPlanController.java
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.RequestBody;
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/submit")
public Object submitSalesPlan(@RequestBody String boday) {
//校验数据
Assert.notNull(id, "The id must not be null");
Assert.notNull(state, "The state must not be null");
return ResponseObj.success();
}
/**
* 日常销售计划审批: 同意/驳回
* @param saleaPlanApprove
* @return
*/
@PostMapping("/salesplan/approve")
public Object approveSalesPlan(SaleaPlanApprove saleaPlanApprove) {
Date approveTime = new Date();
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.approveSalesPlanForDaily(id, approveState, saleaPlanApprove.getApproveMemo());
return ResponseObj.success();
}
/**
* 临时销售计划审批: 同意/驳回
* @param saleaPlanApprove
* @return
*/
@PostMapping("/salesplan/temp/approve")
public Object 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();
}
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/request/SaleaPlanApprove.java 0 → 100644
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;
}
}
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/bill/SalesPlanTemp.mk 0 → 100644
<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
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/Inventory.mk 0 → 100644
<model>
<header>
<type>bcp.type.DataModel</type>
<package>com.xyst.dinas.sales.datamodel</package>
<title>库存</title>
<name>Inventory</name>
<tags></tags>
<description>库存</description>
<templateName>mk.ide.ui.editor.data.model.template.bill</templateName>
<tablePrefix>xyst_dinas_sales_</tablePrefix>
</header>
<content>
<dataModel id='4d1e55e3-fb56-4020-878c-c74fe7fa12f2' multiVersion='' domainInherit='undefined' tableName='xyst_dinas_sales_inventory'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='12a14135-5cee-4563-8efb-b089b3d77a99' name='regionalCompany' columnName='regional_company' title='区域公司' type='com.xyst.dinas.biz.datamodel.Organization' default='' precision='' isArray='false'>
<annotation id='527cba7b-1eef-4497-abde-20591745cb3b' attributeId='967e6993-1c60-4bdc-94f2-d3884456e306' name='length' value='undefined'>
</annotation>
<annotation id='99562290-b829-4b40-b3ed-8a39d941b1c6' attributeId='62f868c8-e8a7-48e9-b53e-b5ce244f9702' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='d10220a7-89cd-4671-9b48-c13b51672859' name='station' columnName='station' title='场站' type='com.xyst.dinas.biz.datamodel.Station' default='' precision='' isArray='false'>
<annotation id='d9222f6b-f0ad-4597-92c4-4f35740d0ca7' attributeId='e4203856-cfc8-4a88-80c7-d92a82c47310' name='length' value='undefined'></annotation>
<annotation id='c7cbe49c-85ca-4864-b4f1-d3127ab7f058' attributeId='6bd559ee-1b66-4ac7-a706-14643629e9b2' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='8f779083-c728-490e-a459-8916298b1590' name='dinasType' columnName='dinas_type' title='砂石类型' type='com.xyst.dinas.biz.datamodel.DinasType' default='' precision='' isArray='false'>
<annotation id='8edb047a-b327-4ba7-9b73-3e4f1bc68c65' attributeId='428a37e2-29f0-4509-9aa1-166f6d0d1e38' name='length' value='undefined'>
</annotation>
<annotation id='5af90fef-5a6a-4015-910a-5b07e0f67ef2' attributeId='364e9851-e1b5-466f-a526-fb6fbfe35898' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='e6047347-2d63-49f4-b4bd-24f354457d17' name='amount' columnName='amount' title='库存量' type='fixnum' default='' precision='' isArray='false'>
<annotation id='8901a903-1817-4353-abd6-2920476b69fa' attributeId='774e6bb7-227d-4fb6-b836-af22c1dae5bb' name='length' value='undefined'>
</annotation>
</attribute>
<attribute id='415b40cc-1cdc-4483-91a6-bba4a949e2d4' name='price' columnName='price' title='单价' type='fixnum' default='' precision='' isArray='false'>
<annotation id='a77dfabd-70f7-4bba-a707-2796232933cc' attributeId='307f585e-2665-423e-89b3-409d6ba6e349' name='length' value='100'>
</annotation>
<annotation id='13dc278b-c705-492c-b2cc-42e985f4c49e' attributeId='955c2da2-f35a-4f19-a4e5-cd2dae289e87' name='precision' value='12'>
</annotation>
<annotation id='46b02079-0159-4429-aebe-35f11d4c47ea' attributeId='91da4a43-ce42-42a8-8139-82e20c81ce09' name='scale' value='2'>
</annotation>
</attribute>
<hibernate>/xyst.dinas.sales/src/main/resources/config/Inventory.hbm.xml</hibernate>
</dataModel>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/SalesPlanTemp.mk 0 → 100644
<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
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/query/SalesPlan.mk
......@@ -33,7 +33,7 @@
<description></description>
</field>
<field title='区域公司'>
<name>regionalCompany.id</name>
<name>regionCompany.id</name>
<type>uuid</type>
<ref>
<type></type>
......
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/query/SalesPlanTemp.mk 0 → 100644
<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
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan$sequence.jmx
<?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>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan$serial.jmx
<?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>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan.jmx
<?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>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlan$sequence.jmx
<?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>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlan$serial.jmx
<?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>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlan.jmx
<?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>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp$sequence.jmx 0 → 100644
<?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>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp$serial.jmx 0 → 100644
<?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>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp.jmx 0 → 100644
<?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>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/Inventory.jmx 0 → 100644
<?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>4d1e55e3-fb56-4020-878c-c74fe7fa12f2</id>
<name>com.xyst.dinas.sales.datamodel.Inventory</name>
<title>库存</title>
<description>库存</description>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.biz.datamodel.Organization</dependency>
<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
<dependency>com.xyst.dinas.biz.datamodel.DinasType</dependency>
<dependency>bcp.type.constraint.Numeric</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</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>12a14135-5cee-4563-8efb-b089b3d77a99</m:id>
<m:name>regionalCompany</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>d10220a7-89cd-4671-9b48-c13b51672859</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:id>8f779083-c728-490e-a459-8916298b1590</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>e6047347-2d63-49f4-b4bd-24f354457d17</m:id>
<m:name>amount</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>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>2</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>415b40cc-1cdc-4483-91a6-bba4a949e2d4</m:id>
<m:name>price</m:name>
<m:title>单价</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
</m:attributes>
</m:class>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/SalesPlanTemp$SalesPlanTempDetails.jmx 0 → 100644
<?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>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/SalesPlanTemp.jmx 0 → 100644
<?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>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/SalesPlan.jmx
......@@ -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>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/SalesPlanTemp.jmx 0 → 100644
<?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>
backend/xyst.dinas.sales/src/main/resources/config/Inventory.hbm.xml 0 → 100644
<?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.Inventory" table="xyst_dinas_sales_inventory" 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="assigned" />
</id>
<version name="version" type="int" column="version"/>
<property name="discard" type="boolean" not-null="false">
<column name="discard"></column>
</property>
<many-to-one name="regionalCompany" entity-name="com.xyst.dinas.biz.datamodel.Organization" fetch="select">
<column name="regional_company" 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"/>
</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="amount" type="big_decimal" not-null="false">
<column name="amount" precision="12" scale="4"></column>
</property>
<property name="price" type="big_decimal" not-null="false">
<column name="price" precision="12" scale="2"></column>
</property>
</class>
</hibernate-mapping>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/resources/config/SalesPlanTemp.hbm.xml 0 → 100644
<?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