Skip to content

C
cloud-fb
Commit 3184f3ae by 闫恒
Options

Merge branch 'feature/exception_data' into 'develop' 

Feature/exception data

See merge request kunlun/xyst_dinas/xyst_dinas_backend!85
parents 628aae2e b71ed7e4
Showing with 1305 additions and 51 deletions
backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx
......@@ -565,6 +565,37 @@
</m:function-definition>
<m:icon>iconfont iconcheliangliangfang1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>dd4ab671-52ba-4040-bd65-7ba13786106a</m:id>
<m:name>exception_data</m:name>
<m:title>异常数据</m:title>
<m:index>1600</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:role></m:role>
<m:function-definition>
<m:view>function-exception-data</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconhetongzhihangfenxi1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>db78d057-269e-4689-b3ea-f90642334060</m:id>
<m:name>exception_data_approval</m:name>
<m:title>异常数据审核</m:title>
<m:index>1700</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:role></m:role>
<m:function-definition>
<m:view>function-exception-data-approval</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconhetongzhihangfenxi1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>e536e311-8d22-4730-b3d7-444fd718c883</m:id>
<m:name>self_pickup_car</m:name>
......@@ -1515,7 +1546,7 @@
<m:function-node>
<m:id>18ecb4c7-1d00-42f7-af60-1b55bb895199</m:id>
<m:name>ship_list</m:name>
<m:title>船只备案</m:title>
<m:title>船舶台账</m:title>
<m:index>9000</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.biz.auth.ShipInfoList</m:privilege>
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/RetailInfoServiceImpl.java
......@@ -213,5 +213,18 @@ public class RetailInfoServiceImpl implements RetailInfoService {
return orGet;
}
@Override
public KObject createRetailInfo(KObject station, KObject dinasType, String carNum, String retailName, Double dealAmount, Double amount) {
KObject orGet = retailInfoDao.createOrGet(retailName, carNum, station);
KClass bean = Amino.getStaticMetadataContext().getBean(RetailInfoConstant.DETAIL_ENTITY, KClass.class);
KObject object = bean.newInstance();
object.set("purchaseAmount",dealAmount);
object.set("master",retailInfoDao.load(orGet.getUuid("id")));
object.set("dinasType",dinasType);
object.set(BaseConstants.ID,UUID.randomUUID());
retailInfoDao.saveOrUpdate(object);
return orGet;
}
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/service/RetailInfoService.java
......@@ -30,4 +30,6 @@ public interface RetailInfoService {
BigDecimal selectBuyAmountByIdCard(String idCard, UUID fromString);
KObject create(KObject station, KObject dinasType, String retailIdNum, String retailName, String carInfo, Double dealAmount, Double amount);
KObject createRetailInfo(KObject station, KObject dinasType, String carNum, String retailName, Double dealAmount, Double amount);
}
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/auth/ShipInfoCard.mk
......@@ -8,6 +8,6 @@
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='78b3f83f-2b84-4db6-88b6-c99869a91037' category='业务管理/船只备案（区域公司）' seq='0'></privilege>
<privilege type='TOKEN' target-type='' id='78b3f83f-2b84-4db6-88b6-c99869a91037' category='业务管理/船舶台账（区域公司）' seq='0'></privilege>
</content>
</model>
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/auth/ShipInfoCreate.mk
......@@ -8,6 +8,6 @@
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='604b514f-52b2-43b0-8c16-cba1f511c7ab' category='业务管理/船只备案（区域公司）' seq='0'></privilege>
<privilege type='TOKEN' target-type='' id='604b514f-52b2-43b0-8c16-cba1f511c7ab' category='业务管理/船舶台账（区域公司）' seq='0'></privilege>
</content>
</model>
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/auth/ShipInfoDelete.mk
......@@ -8,6 +8,6 @@
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='f250186a-ffd6-4b3e-94f7-00fadbf2e7c0' category='业务管理/船只备案（区域公司）' seq='0'></privilege>
<privilege type='TOKEN' target-type='' id='f250186a-ffd6-4b3e-94f7-00fadbf2e7c0' category='业务管理/船舶台账（区域公司）' seq='0'></privilege>
</content>
</model>
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/auth/ShipInfoEdit.mk
......@@ -8,6 +8,6 @@
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='0a5129cd-ee16-491f-9f99-8817c7d75925' category='业务管理/船只备案（区域公司）' seq='0'></privilege>
<privilege type='TOKEN' target-type='' id='0a5129cd-ee16-491f-9f99-8817c7d75925' category='业务管理/船舶台账（区域公司）' seq='0'></privilege>
</content>
</model>
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/auth/ShipInfoList.mk
......@@ -8,6 +8,6 @@
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='dfa9012c-dccc-463e-a3ee-4e181f702dbb' category='业务管理/船只备案（区域公司）' seq='0'></privilege>
<privilege type='TOKEN' target-type='' id='dfa9012c-dccc-463e-a3ee-4e181f702dbb' category='业务管理/船舶台账（区域公司）' seq='0'></privilege>
</content>
</model>
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/datamodel/SandMiningArea.mk
......@@ -31,6 +31,10 @@
<annotation id='7c36721e-9bbd-42ae-bfbb-1b0395567be3' attributeId='aee8df10-530c-44b7-b12b-474ab96694a7' name='length' value='undefined'>
</annotation>
</attribute>
<attribute id='8a13aebf-60e6-4ce2-9b69-5a3233adf10b' name='areaCoordType' columnName='area_coord_type' title='坐标类型' type='int' default='' precision='' isArray='false'>
<annotation id='71293be4-9f0f-4f6c-90dd-2302126527c7' attributeId='cf03eccd-1f62-4514-b054-196b8ab201c9' name='length' value='1'>
</annotation>
</attribute>
<attribute id='05241b45-15d9-425b-933a-d20f108c2052' name='stationCoordinate' columnName='station_coordinate' title='采区坐标' type='string' default='' precision='' isArray='false'>
<annotation id='0981a94a-a675-4817-9e9b-64ce28bc6735' attributeId='6321c30c-0e52-4b7b-9034-b87a5a8026f7' name='length' value='1500'>
</annotation>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/auth/ShipInfoCard.jmx
......@@ -9,7 +9,7 @@
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>业务管理/船只备案（区域公司）</m:category>
<m:category>业务管理/船舶台账（区域公司）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/auth/ShipInfoCreate.jmx
......@@ -9,7 +9,7 @@
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>业务管理/船只备案（区域公司）</m:category>
<m:category>业务管理/船舶台账（区域公司）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/auth/ShipInfoDelete.jmx
......@@ -9,7 +9,7 @@
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>业务管理/船只备案（区域公司）</m:category>
<m:category>业务管理/船舶台账（区域公司）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/auth/ShipInfoEdit.jmx
......@@ -9,7 +9,7 @@
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>业务管理/船只备案（区域公司）</m:category>
<m:category>业务管理/船舶台账（区域公司）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/auth/ShipInfoList.jmx
......@@ -9,7 +9,7 @@
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>业务管理/船只备案（区域公司）</m:category>
<m:category>业务管理/船舶台账（区域公司）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/SandMiningArea.jmx
......@@ -142,6 +142,25 @@
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>area_coord_type</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>8a13aebf-60e6-4ce2-9b69-5a3233adf10b</m:id>
<m:name>areaCoordType</m:name>
<m:title>坐标类型</m:title>
<m:type>int</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>1500</m:value>
</m:annotation>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/SandMiningArea.jmx
......@@ -135,6 +135,16 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>areaCoordType</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>sandMiningQuantity</m:name>
<m:title>可采量</m:title>
<m:type>string</m:type>
......
backend/xyst.dinas.biz/src/main/resources/config/SandMiningArea.hbm.xml
......@@ -59,6 +59,12 @@
</column>
</property>
<property name="areaCoordType" type="integer" not-null="true">
<column name="area_coord_type" >
<comment>坐标类型 </comment>
</column>
</property>
<property name="stationCoordinate" type="nstring" not-null="false">
<column name="station_coordinate">
<comment>采区坐标区域 按照逗号和分号分隔</comment>
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/constant/SalesRecordConstant.java
......@@ -152,4 +152,40 @@ public interface SalesRecordConstant {
*/
String PIC = "pic";
//数据来源
String DATA_SOURCE = "dataSource";
//原因
String REASON = "reason";
//删除原因
String DEL_REASON = "delReason";
//方法类型
String METHOD_TYPE = "methodType";
//数据来源字段值
String DATA_SOURCE_REN_GONG = "人工补录";
String DATA_SOURCE_DI_BANG = "地磅";
//方法类型 新增
Integer ADD_METHOD = 0;
//---- 删除
Integer DEL_METHOD = 1;
//未提交状态
Integer TO_NOT_SUBMITTED= 0;
//待审核状态
Integer TO_AUDIT = 1;
//审核通过状态
Integer APPROVED = 2;
//审核驳回
Integer APPROVE_BACK = 3;
/**
* 代表新增审核通过 扣过钱
*/
String APPROVE_STATE_DEL = "approveStateDel";
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/SalesRecordDao.java
package com.xyst.dinas.sales.dao;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.sales.web.info.SalesRecordInfo;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.sales.web.info.SalesRecordInfo;
public interface SalesRecordDao {
KObject load(UUID id);
......@@ -21,4 +21,10 @@ public interface SalesRecordDao {
void insertList(List<KObject> salesRecordInfos);
void updateActualTransportationById(SalesRecordInfo salesRecordInfo);
void deleteById(UUID id,String delReason);
void approval(KObject kobject);
void update(KObject salesRecord);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/dao/SalesRecordDaoImpl.java
package com.xyst.dinas.sales.internal.dao;
import java.math.BigDecimal;
import java.util.*;
import javax.persistence.Tuple;
import com.beecode.amino.common.Convert;
import com.beecode.amino.core.Amino;
import com.beecode.bcp.core.context.AminoContextHolder;
import com.beecode.bcp.serial.Serial;
import com.beecode.bcp.type.KClass;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.common.BaseConstants;
import com.beecode.util.DateUtil;
import com.xyst.dinas.sales.constant.SalesRecordConstant;
import com.xyst.dinas.sales.dao.SalesRecordDao;
import com.xyst.dinas.sales.web.info.SalesRecordInfo;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
......@@ -22,10 +22,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.hibernate5.HibernateCallback;
import org.springframework.orm.hibernate5.HibernateOperations;
import com.beecode.amino.common.Convert;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.sales.constant.SalesRecordConstant;
import com.xyst.dinas.sales.dao.SalesRecordDao;
import javax.persistence.Tuple;
import java.math.BigDecimal;
import java.util.*;
public class SalesRecordDaoImpl implements SalesRecordDao, SalesRecordConstant {
@Autowired
......@@ -129,4 +128,77 @@ public class SalesRecordDaoImpl implements SalesRecordDao, SalesRecordConstant {
}
}
@Override
public void deleteById(UUID id,String delReason) {
KObject staff = AminoContextHolder.getContext().getStaff();
KObject kobject = (KObject) template.load(ENTITY, id);
//审核状态
Integer approvalState = Integer.valueOf(kobject.getString(SalesRecordConstant.APPROVE_STATE));
//当前 数据来源
String dataSource = kobject.getString(SalesRecordConstant.DATA_SOURCE);
//当前数据 付款类型
String payMentSource = kobject.getString(SalesRecordConstant.PAYMENTSOURCE);
if(SalesRecordConstant.DATA_SOURCE_REN_GONG.equals(dataSource)){ //人工
//当前数据方法类型
Integer methodType = Integer.valueOf(kobject.getString(SalesRecordConstant.METHOD_TYPE));
//赋值删除状态 为后续删除审核做判断
if(SalesRecordConstant.ADD_METHOD.equals(methodType)){ //如果是新增的数据判断状态
if(SalesRecordConstant.TO_NOT_SUBMITTED.equals(approvalState)){
kobject.set(SalesRecordConstant.APPROVE_STATE, SalesRecordConstant.TO_NOT_SUBMITTED );
}else if(SalesRecordConstant.APPROVE_BACK.equals(approvalState) ){
kobject.set(SalesRecordConstant.APPROVE_STATE, SalesRecordConstant.APPROVE_BACK );
}else{
if(SalesRecordConstant.APPROVED.equals(approvalState) ||SalesRecordConstant.APPROVED.equals(Integer.valueOf(kobject.getString(SalesRecordConstant.APPROVE_STATE_DEL))) ){
kobject.set(SalesRecordConstant.APPROVE_STATE, SalesRecordConstant.TO_AUDIT );
}
}
}else if(SalesRecordConstant.DEL_METHOD.equals(methodType)){ //新增过 然后进行删除过的数据
if(SalesRecordConstant.APPROVE_BACK.equals(approvalState) ){
kobject.set(SalesRecordConstant.APPROVE_STATE, SalesRecordConstant.TO_AUDIT );
}
}
}else if(SalesRecordConstant.DATA_SOURCE_DI_BANG.equals(dataSource)){ // 地磅
kobject.set(SalesRecordConstant.APPROVE_STATE_DEL,SalesRecordConstant.APPROVED);//如果是地磅数据 赋值二次状态为通过,地磅数据不需要审核
kobject.set(SalesRecordConstant.APPROVE_STATE, SalesRecordConstant.TO_AUDIT ); //删除赋予状态为未审核
}
kobject.set(BaseConstants.MODIFY_TIME, new Date());
kobject.set(SalesRecordConstant.DEL_REASON, delReason);
kobject.set(BaseConstants.DEL, true);
kobject.set(SalesRecordConstant.METHOD_TYPE, SalesRecordConstant.DEL_METHOD);
template.update(kobject);
}
@Override
public void approval(KObject approObject) {
KObject kobject = (KObject) template.load(ENTITY, approObject.getUuid(BaseConstants.ID));
kobject.set(BaseConstants.MODIFY_TIME, new Date());
Integer approvalState = Integer.valueOf(approObject.getString(SalesRecordConstant.APPROVE_STATE));
kobject.set(SalesRecordConstant.APPROVE_STATE, approvalState);
if(approObject.getString(SalesRecordConstant.APPROVE_STATE_DEL) != null){
kobject.set(SalesRecordConstant.APPROVE_STATE_DEL, Integer.valueOf(approObject.getString(SalesRecordConstant.APPROVE_STATE_DEL)));
}
//当前数据方法类型
Integer methodType = Integer.valueOf(approObject.getString(SalesRecordConstant.METHOD_TYPE));
if(SalesRecordConstant.DEL_METHOD.equals(methodType)){
if(SalesRecordConstant.APPROVE_BACK.equals(approvalState)){
//逻辑
kobject.set(BaseConstants.DEL, false);
}
}
template.update(kobject);
}
@Override
public void update(KObject kobject) {
KObject id = load(kobject.getUuid("id"));
kobject.set(BaseConstants.CREATE_TIME, id.getDate(BaseConstants.CREATE_TIME));
kobject.set(BaseConstants.MODIFY_TIME, new Date());
kobject.set(BaseConstants.DEL, false);
template.merge(kobject);
}
}
\ No newline at end of file
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesRecordServiceImpl.java
package com.xyst.dinas.sales.internal.service;
import com.beecode.amino.core.Amino;
import com.beecode.bcp.type.KClass;
import com.beecode.bcp.type.KObject;
import com.beecode.bcp.type.json.JSONObjectUtils;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.beecode.inz.basis.util.JsonUtil;
import com.beecode.inz.common.BaseConstants;
import com.fasterxml.jackson.databind.JsonNode;
import com.xyst.dinas.biz.dao.DinasOrganizationDao;
import com.xyst.dinas.biz.dao.DinasTypeDao;
import com.xyst.dinas.biz.dao.ProductionLineDao;
......@@ -104,6 +109,8 @@ public class SalesRecordServiceImpl implements SalesRecordService {
salesRecord.set(SalesRecordConstant.DEALTIME, salesRecordInfo.getGrossWeightTime());
salesRecord.set(SalesRecordConstant.DEALBILLCODE, salesRecordInfo.getDealBillCode());
salesRecord.set(SalesRecordConstant.CARINFO, salesRecordInfo.getCarNum());
//modify by 新增数据来源类型 from yanH for 2022-04-18
salesRecord.set(SalesRecordConstant.DATA_SOURCE, SalesRecordConstant.DATA_SOURCE_DI_BANG);
salesRecord.set(SalesRecordConstant.PRICE, salesRecordInfo.getPrice());
Integer paymentSource = salesRecordInfo.getPaymentSource();
......@@ -346,6 +353,230 @@ public class SalesRecordServiceImpl implements SalesRecordService {
return error1;
}
/**
* @Author yanHeng
* @Date 2022/4/18 10:07
* @Param [salesRecord, station]
* @return java.util.HashMap<java.lang.String,java.lang.Object>
**/
@Override
@Transactional
public HashMap<String, Object> saveSalesRecordInfo(SalesRecordInfo salesRecordVO, KObject station) {
logger.info("补录异常数据,传输参数为:"+ JsonUtil.beanToJson(salesRecordVO));
HashMap<String, Object> returnMap = new HashMap<>(12);
try {
BigDecimal advanceBalance1 = new BigDecimal(0);
Date thentime = new Date();
// 获取砂石类型
KObject dinasType;
dinasType = dinasTypeDao.load(UUID.fromString(salesRecordVO.getDinasTypeId()));
KObject regionalCompany;
//获取区域公司
regionalCompany = station.get("regionalCompany");
salesRecordVO.setDealAmount(salesRecordVO.getGrossWeight().subtract(salesRecordVO.getTareWeight()).doubleValue());
KObject salesRecord = salesRecordClass.newInstance();
if(null == salesRecordVO.getId()){
salesRecord.set(SalesRecordConstant.ID, UUID.randomUUID());
}
salesRecord.set(SalesRecordConstant.CREATETIME, thentime);
salesRecord.set(SalesRecordConstant.STATION, station);
salesRecord.set(SalesRecordConstant.GROSS_WEIGHT, salesRecordVO.getGrossWeight());
salesRecord.set(SalesRecordConstant.TARE_WEIGHT, salesRecordVO.getTareWeight());
salesRecord.set(SalesRecordConstant.DEALAMOUNT, salesRecordVO.getGrossWeight().subtract(salesRecordVO.getTareWeight()));
salesRecord.set(SalesRecordConstant.GROSS_WEIGHT_TIME, salesRecordVO.getGrossWeightTimeInfo());
salesRecord.set(SalesRecordConstant.TARE_WEIGHT_TIME, salesRecordVO.getTareWeightTimeInfo());
salesRecord.set(SalesRecordConstant.SYNCTIME, thentime);
salesRecord.set(SalesRecordConstant.DEALTIME, salesRecordVO.getGrossWeightTimeInfo()); // 销售时间为毛重时间
salesRecord.set(SalesRecordConstant.DEALBILLCODE, salesRecordVO.getDealBillCode()); //销售单号
salesRecord.set(SalesRecordConstant.CARINFO, salesRecordVO.getCarNum());
salesRecord.set(SalesRecordConstant.DATA_SOURCE, SalesRecordConstant.DATA_SOURCE_REN_GONG);
salesRecord.set(SalesRecordConstant.REASON, salesRecordVO.getReason());
salesRecord.set(SalesRecordConstant.PRICE, salesRecordVO.getPrice());
salesRecord.set(SalesRecordConstant.METHOD_TYPE, SalesRecordConstant.ADD_METHOD);
salesRecord.set(SalesRecordConstant.APPROVE_STATE, salesRecordVO.getApproveState());
Integer paymentSource = salesRecordVO.getPaymentSource();
if(paymentSource==0){
salesRecord.set(SalesRecordConstant.PAYMENTSOURCE,PayMentSourceEnum.Advance );
}else{
salesRecord.set(SalesRecordConstant.PAYMENTSOURCE,PayMentSourceEnum.Cash );
}
salesRecord.set(SalesRecordConstant.REGIONALCOMPANY, regionalCompany);
salesRecord.set(SalesRecordConstant.DINASTYPE, dinasType);
salesRecord.set(SalesRecordConstant.AMOUNT, salesRecordVO.getAmount());
salesRecord.set(SalesRecordConstant.DEALAMOUNT, salesRecordVO.getDealAmount());
//如果是散客
if (null != salesRecordVO.getRetailName() && ! "".equals(salesRecordVO.getRetailName())) {
salesRecord.set(SalesRecordConstant.CUSTOMERTYPE, CustomerTypeEnum.RetailInfo.name());
KObject retailInfo = retailInfoService.createRetailInfo(station, dinasType, salesRecordVO.getCarNum(), salesRecordVO.getRetailName(), salesRecordVO.getDealAmount(), salesRecordVO.getAmount());
salesRecord.set(SalesRecordConstant.RETAILINFO, retailInfo);
} else {
//如果不为散户 则必定有合同 项目 购砂单位 区域公司
salesRecord.set(SalesRecordConstant.CUSTOMERTYPE, CustomerTypeEnum.PurchaseSandCompany.name());
// 获取项目KObject
KObject project;
KObject contract;
KObject purchaseSandCompany;
contract = contractDao.load(UUID.fromString(salesRecordVO.getContractId()));
// 获取合同KObject
project = contract.get("project");
// 获取区域公司KObject
regionalCompany = contract.get("regionalCompany");
// 获取购砂单位KObject
purchaseSandCompany = contract.get("purchaseSandUnit");
salesRecord.set(SalesRecordConstant.PROJECT, project);
salesRecord.set(SalesRecordConstant.REGIONALCOMPANY, regionalCompany);
salesRecord.set(SalesRecordConstant.CONTRACT, contract);
salesRecord.set(SalesRecordConstant.PURCHASESANDCOMPANY, purchaseSandCompany);
salesRecord.set(SalesRecordConstant.DEALAMOUNT, salesRecordVO.getDealAmount() == null ? BigDecimal.ZERO : BigDecimal.valueOf(salesRecordVO.getDealAmount()));
salesRecord.set(SalesRecordConstant.DISCARD, false);
salesRecord.set(SalesRecordConstant.DEL, false);
}
String salesRecordId = "";
if (null == salesRecordVO.getId()) {
UUID salesRecordIds = salesRecordDao.insert(salesRecord);
salesRecordId = salesRecordIds.toString();
}else {
salesRecord.set(BaseConstants.ID,UUID.fromString(salesRecordVO.getId()));
salesRecord.set("version",salesRecordVO.getVersion());
salesRecordDao.update(salesRecord);
salesRecordId = salesRecordVO.getId();
}
returnMap.put("code", 200);
returnMap.put("id", salesRecordId);
returnMap.put("advanceBalance", advanceBalance1);
returnMap.put("message", "保存成功");
return returnMap;
} catch (Exception e) {
e.printStackTrace();
returnMap.put("code", 10031);
returnMap.put("message", "系统内部错误");
return returnMap;
}
}
@Override
@org.springframework.transaction.annotation.Transactional
public ResponseObj deleteById(JsonNode jsonNode) {
KObject kobject;
JsonNode salesRecords = jsonNode.withArray("salesRecords");
for (JsonNode salesRecord : salesRecords) {
kobject = JSONObjectUtils.toObject(salesRecord, Amino.getStaticMetadataContext().getBean(SalesRecordConstant.ENTITY, KClass.class));
salesRecordDao.deleteById(kobject.getUuid(BaseConstants.ID),kobject.getString(SalesRecordConstant.DEL_REASON));
}
return ResponseObj.success("删除成功");
}
@Override
@org.springframework.transaction.annotation.Transactional
public ResponseObj approvalBatch(JsonNode jsonNode) {
KObject kobject;
Boolean flag = true;
JsonNode salesRecords = jsonNode.withArray("salesRecords");
for (JsonNode salesRecord : salesRecords) {
kobject = JSONObjectUtils.toObject(salesRecord, Amino.getStaticMetadataContext().getBean(SalesRecordConstant.ENTITY, KClass.class));
UUID id = kobject.getUuid("id");
if (null == id) {
return ResponseObj.error(400, "'id' must be not null!");
}
//判断是审核通过 还是驳回
if (null == kobject.getString(SalesRecordConstant.APPROVE_STATE) && kobject.getString(SalesRecordConstant.APPROVE_STATE).isEmpty()) {
return ResponseObj.error(400, "审核状态 must be not null!");
}
//决定审批状态
Integer approvalState = Integer.valueOf(kobject.getString(SalesRecordConstant.APPROVE_STATE));
KObject salesRecordInfo = salesRecordDao.load(id); //查询当前数据方法类型
//判断当前数据 收款类型是否为预付款
String payMentSource = salesRecordInfo.getString(SalesRecordConstant.PAYMENTSOURCE);
//当前数据方法类型
Integer methodType = Integer.valueOf(salesRecordInfo.getString(SalesRecordConstant.METHOD_TYPE));
//判断客户类型是否是区域公司 是否有合同
if(CustomerTypeEnum.PurchaseSandCompany.name().equals(salesRecordInfo.getString(SalesRecordConstant.CUSTOMERTYPE))){
//如果通过 //如果为预付款类型 进行 对金额进行操作
if(SalesRecordConstant.APPROVED.equals(approvalState) && PayMentSourceEnum.Advance.name().equals(payMentSource)){
UUID contractId = salesRecordInfo.get("contract").getUuid("id");
UUID dinasTypeId = salesRecordInfo.get("dinasType").getUuid("id");
BigDecimal amount = BigDecimal.ZERO;
// 扣减合同的预付款金额= 异常数据的总价 扣减
if(SalesRecordConstant.ADD_METHOD.equals(methodType)){
if(null == salesRecordInfo.getString(SalesRecordConstant.APPROVE_STATE_DEL)){
kobject.set(SalesRecordConstant.APPROVE_STATE_DEL, SalesRecordConstant.APPROVED); //代表新增审核通过了 扣过钱
//查询合同余额,如果扣减后小于0则不允许交易
KObject kObject = contractService.queryContract(contractId);
BigDecimal advanceBalance = kObject.getBigDecimal("advanceBalance");
if (advanceBalance == null || advanceBalance.compareTo(new BigDecimal(kObject.getString(SalesRecordConstant.AMOUNT))) == -1) {
return ResponseObj.error(400,"合同名称为："+salesRecordInfo.get("contract").getUuid("contractName") +"的预付款余额不足");
}
//获取当前异常数据的总价
amount = BigDecimal.ZERO.subtract(BigDecimal.valueOf(salesRecordInfo.getDouble(SalesRecordConstant.AMOUNT)));
}else {
if(!SalesRecordConstant.APPROVED.equals(Integer.valueOf(salesRecordInfo.getString(SalesRecordConstant.APPROVE_STATE_DEL)))){ //如果没扣过钱 则进行扣钱
kobject.set(SalesRecordConstant.APPROVE_STATE_DEL, SalesRecordConstant.APPROVED); //代表新增审核通过了 扣过钱
//查询合同余额,如果扣减后小于0则不允许交易
KObject kObject = contractService.queryContract(contractId);
BigDecimal advanceBalance = kObject.getBigDecimal("advanceBalance");
if (advanceBalance == null || advanceBalance.compareTo(new BigDecimal(kObject.getString(SalesRecordConstant.AMOUNT))) == -1) {
return ResponseObj.error(400,"合同名称为："+salesRecordInfo.get("contract").getUuid("contractName") +"的预付款余额不足");
}
//获取当前异常数据的总价
amount = BigDecimal.ZERO.subtract(BigDecimal.valueOf(salesRecordInfo.getDouble(SalesRecordConstant.AMOUNT)));
}
}
}else if(SalesRecordConstant.DEL_METHOD.equals(methodType)){
//如果数据状态为新增后的审核通过,进行删除
if(SalesRecordConstant.APPROVED.equals(Integer.valueOf(salesRecordInfo.getString(SalesRecordConstant.APPROVE_STATE_DEL)))){
//逻辑删除 反还合同的预付款金额= 异常数据的总价 退还
amount = BigDecimal.ZERO.add(new BigDecimal(salesRecordInfo.getString(SalesRecordConstant.AMOUNT)));
}
}
flag = contractService.modifyInventory(contractId,
dinasTypeId, BigDecimal.ZERO, amount);
}
}
if(!flag){
return ResponseObj.error(400,"预付款余额审核异常");
}else{
//修改审核状态
kobject.set(SalesRecordConstant.METHOD_TYPE,Integer.valueOf(salesRecordInfo.getString(SalesRecordConstant.METHOD_TYPE)));
salesRecordDao.approval(kobject);
}
}
return ResponseObj.success("审核成功");
}
@Override
public KObject getById(UUID id) {
return salesRecordDao.load(id);
}
private Set<String> createNoExist(Sheet sheet, int lastRowNum, Set<KObject> organizations, Set<KObject> stations, Set<KObject> dinasTypes, Set<KObject> retailInfos, Set<String> strings) {
Row row;
List<KObject> saleRecord = new ArrayList<>();
......@@ -481,6 +712,8 @@ public class SalesRecordServiceImpl implements SalesRecordService {
salesRecord.set(SalesRecordConstant.TARE_WEIGHT, tareWeight);
salesRecord.set(SalesRecordConstant.DISCARD, false);
salesRecord.set(SalesRecordConstant.DEL, false);
//modify by 新增数据来源类型 from yanH for 2022-04-18
salesRecord.set(SalesRecordConstant.DATA_SOURCE, SalesRecordConstant.DATA_SOURCE_REN_GONG);
return salesRecord;
}
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/ShipQuantityServiceImpl.java
......@@ -9,6 +9,7 @@ import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.beecode.inz.common.exception.BusinessException;
import com.xyst.dinas.biz.dao.DinasTypeDao;
import com.xyst.dinas.biz.dao.SandMiningAreaDao;
import com.xyst.dinas.biz.dao.ShipInfoDao;
import com.xyst.dinas.contract.internal.dao.ContractDao;
import com.xyst.dinas.contract.service.ContractService;
......@@ -53,6 +54,9 @@ public class ShipQuantityServiceImpl implements ShipQuantityService {
private ShipInfoDao shipInfoDao;
@Autowired
private SandMiningAreaDao sandMiningAreaDao;
@Autowired
private LogService logService;
/**
......@@ -71,11 +75,13 @@ public class ShipQuantityServiceImpl implements ShipQuantityService {
UUID purchaseSandUnitId = kObject.get("purchaseSandUnit").getUuid("id");
UUID contractId = kObject.get("contract").getUuid("id");
UUID dinasTypeId = kObject.get("dinasType").getUuid("id");
UUID sandMiningAreaId = kObject.get("sandMiningArea").getUuid("id");
KObject contract = contractDao.load(contractId);
kObject.set("contract", contract);
kObject.set("project", projectFiledDao.load(projectId));
kObject.set("purchaseSandUnit", purchaseSandCompanyDao.load(purchaseSandUnitId));
kObject.set("dinasType", dinasTypeDao.load(dinasTypeId));
kObject.set("sandMiningArea", sandMiningAreaDao.load(sandMiningAreaId));
UUID uuid = shipQuantityDao.create(kObject);
//记录操作日志
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/SalesRecordService.java
package com.xyst.dinas.sales.service;
import java.util.HashMap;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.fasterxml.jackson.databind.JsonNode;
import com.xyst.dinas.sales.web.info.SalesRecordInfo;
import org.springframework.web.multipart.MultipartFile;
import java.util.HashMap;
import java.util.UUID;
public interface SalesRecordService {
/**
......@@ -18,4 +21,30 @@ public interface SalesRecordService {
HashMap<String, Object> saveSalesRecordService(SalesRecordInfo salesRecordList, KObject station);
HashMap<String,Object> qualityReportExcelImport(MultipartFile file);
/**
* @Author yanHeng
* @Date 2022/4/18 9:59
* @Param [kobject, station]
* @return java.util.HashMap<java.lang.String,java.lang.Object>
**/
HashMap<String, Object> saveSalesRecordInfo(SalesRecordInfo salesRecord, KObject station);
/**
* @Author yanHeng
* @Date 2022/4/18 15:00
* @Param [jsonNode]
* @return com.beecode.inz.basis.team.pojo.ResponseObj
**/
ResponseObj deleteById(JsonNode jsonNode);
/**
* @Author yanHeng
* @Date 2022/4/18 17:38
* @Param [jsonNode]
* @return void
**/
ResponseObj approvalBatch(JsonNode jsonNode);
KObject getById(UUID id);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/SalesRecordController.java
package com.xyst.dinas.sales.web;
import java.util.HashMap;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.beecode.bcp.type.KObject;
import com.beecode.bcp.type.json.JSONObjectUtils;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.fasterxml.jackson.databind.JsonNode;
import com.xyst.dinas.biz.service.StationService;
import com.xyst.dinas.sales.service.SalesRecordService;
import com.xyst.dinas.sales.web.info.SalesRecordInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.HashMap;
import java.util.UUID;
@RestController
public class SalesRecordController {
@Autowired
SalesRecordService salesRecordService;
@Autowired
StationService stationService;
/**
* create by: 导入销售记录,没有的数据全部新建
......@@ -38,4 +42,109 @@ public class SalesRecordController {
}
return ResponseObj.success("success");
}
/**
* @Author yanHeng
* @Date 2022/4/18 9:56
* @Param [SalesRecordInfo]
* @return java.lang.Object
* 异常数据添加/编辑
**/
@PostMapping(value = "/salesRecord/saveSalesRecordInfo")
public Object saveSalesRecordInfo(@RequestBody SalesRecordInfo salesRecord) {
//判空校验
if (null == salesRecord.getStationId()) {
return ResponseObj.error(400, "请选择具体的场站");
}
if (null == salesRecord.getCarNum()) {
return ResponseObj.error(400, "车牌号不能为空");
}
if (null == salesRecord.getTareWeightTimeInfo()) {
return ResponseObj.error(400, "皮重时间不能为空");
}
if (null == salesRecord.getGrossWeightTimeInfo()) {
return ResponseObj.error(400, "毛重时间不能为空");
}
if (null == salesRecord.getCarNum()) {
return ResponseObj.error(400, "车牌号不能为空");
}
if (null == salesRecord.getDealBillCode()) {
return ResponseObj.error(400, "销售单号不能为空");
}
if (null == salesRecord.getDinasTypeId()) {
return ResponseObj.error(400, "请选择具体的砂石");
}
if (null == salesRecord.getGrossWeight()) {
return ResponseObj.error(400, "毛重不能为空");
}
if (null == salesRecord.getTareWeight()) {
return ResponseObj.error(400, "皮重不能为空");
}
if (null == salesRecord.getPrice()) {
return ResponseObj.error(400, "单价不能为空");
}
if (null == salesRecord.getAmount()) {
return ResponseObj.error(400, "总价不能为空");
}
if (null == salesRecord.getPaymentSource()) {
return ResponseObj.error(400, "收款类型不能为空");
}
if (null == salesRecord.getReason()) {
return ResponseObj.error(400, "原因不能为空");
}
KObject station = stationService.getById(UUID.fromString(salesRecord.getStationId()));
HashMap<String, Object> stringObjectHashMap = salesRecordService.saveSalesRecordInfo(salesRecord, station);
return ResponseObj.error((Integer) stringObjectHashMap.get("code"),stringObjectHashMap.get("message").toString(),stringObjectHashMap.get("id"));
}
/**
* 根据id获取异常数据信息
*
* @param id
* @return
*/
@GetMapping("/salesRecord/{id}")
public ResponseObj getById(@PathVariable("id") UUID id) {
if (id == null) {
return ResponseObj.error(400, "'id' must be not null!");
}
KObject discharging = salesRecordService.getById(id);
return ResponseObj.success("获取成功", discharging);
}
/**
* 根据Id删除销售明细数据
* 只做数据修改,退款需审核
* @param body
* @return
*/
@PostMapping("/salesRecord/deleteSalesRecordBatch")
public ResponseObj deleteById(@RequestBody String body) {
JsonNode jsonNode = JSONObjectUtils.toJson(body);
return salesRecordService.deleteById(jsonNode);
}
/**
* 批量审核异常数据,进行扣款或者退款
* @param body
* @return
*/
@PostMapping("/salesRecord/approvalBatch")
public ResponseObj approvalBatch(@RequestBody String body) {
JsonNode jsonNode = JSONObjectUtils.toJson(body);
return salesRecordService.approvalBatch(jsonNode);
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/ShipQuantityController.java
......@@ -59,6 +59,10 @@ public class ShipQuantityController {
return ResponseObj.error(400, "运砂船不能为空");
}
if (null == kobject.get("sandMiningArea").getUuid("id")) {
return ResponseObj.error(400, "所属采区不能为空");
}
if (null == kobject.get("dealTime")) {
return ResponseObj.error(400, "销售时间不能为空");
}
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/info/SalesRecordInfo.java
package com.xyst.dinas.sales.web.info;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
......@@ -10,6 +13,8 @@ import java.util.Date;
public class SalesRecordInfo {
//主键id
private String id;
/**
* 项目
*/
......@@ -67,6 +72,20 @@ public class SalesRecordInfo {
private Date tareWeightTime;
/**
* 毛重时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date grossWeightTimeInfo;
/**
* 皮重时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date tareWeightTimeInfo;
/**
* 皮重
*/
private BigDecimal tareWeight;
......@@ -150,6 +169,82 @@ public class SalesRecordInfo {
*/
private Integer saleType;
//数据来源
private String dataSource;
//原因
private String reason;
//删除原因
private String delReason;
//方法类型
private Integer methodType;
//版本号
private Integer version;
/**
* 审核状态
*/
private Integer approveState;
public Integer getApproveState() {
return approveState;
}
public void setApproveState(Integer approveState) {
this.approveState = approveState;
}
public Date getGrossWeightTimeInfo() {
return grossWeightTimeInfo;
}
public void setGrossWeightTimeInfo(Date grossWeightTimeInfo) {
this.grossWeightTimeInfo = grossWeightTimeInfo;
}
public Date getTareWeightTimeInfo() {
return tareWeightTimeInfo;
}
public void setTareWeightTimeInfo(Date tareWeightTimeInfo) {
this.tareWeightTimeInfo = tareWeightTimeInfo;
}
public Integer getVersion() {
return version;
}
public void setVersion(Integer version) {
this.version = version;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public Integer getMethodType() {
return methodType;
}
public void setMethodType(Integer methodType) {
this.methodType = methodType;
}
public String getDelReason() {
return delReason;
}
public void setDelReason(String delReason) {
this.delReason = delReason;
}
public String getProductionLineId() {
return productionLineId;
}
......@@ -397,4 +492,20 @@ public class SalesRecordInfo {
public void setSaleType(Integer saleType) {
this.saleType = saleType;
}
public String getDataSource() {
return dataSource;
}
public void setDataSource(String dataSource) {
this.dataSource = dataSource;
}
public String getReason() {
return reason;
}
public void setReason(String reason) {
this.reason = reason;
}
}
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ExceptionApprovalCheck.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>ExceptionApprovalCheck</name>
<title>审核</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='843c71cc-2c88-4dd7-9ce4-c9fd33470389' category='销售/异常数据审核（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ExceptionApprovalList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>ExceptionApprovalList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='367fd08f-ad86-4931-957e-b9f98cf8c66d' category='销售/异常数据审核（区域公司）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ExceptionCard.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>ExceptionCard</name>
<title>卡片查看</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='abf4d4f0-f3c4-404f-997c-396f005a9802' category='销售/异常数据（区域公司）' seq='3'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ExceptionCreate.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>ExceptionCreate</name>
<title>新建</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='313913f0-ff31-4ecf-989c-78353a754d68' category='销售/异常数据（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ExceptionDelete.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>ExceptionDelete</name>
<title>删除</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='de6beff4-ccb1-46e1-9df6-e95c3d3ef79d' category='销售/异常数据（区域公司）' seq='4'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ExceptionEdit.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>ExceptionEdit</name>
<title>编辑</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='2d92b31f-31d1-447c-b00d-1de1e63a6ff9' category='销售/异常数据（区域公司）' seq='2'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ExceptionList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>ExceptionList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='3e9ed943-d381-4291-828b-7f963715cdbf' category='销售/异常数据（区域公司）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/SalesRecord.mk
......@@ -112,6 +112,29 @@
<attribute id='7b72bf25-26fd-4e24-b3f9-67d4f4733ff2' name='dealBillCode' columnName='deal_bill_code' title='销售单号' type='string' default='' precision='' isArray='false'>
<annotation id='82dec9ef-61f8-4e17-ba12-4df0472b1e73' attributeId='511c5c00-ccf7-48cb-a7bb-1743a2b92e57' name='length' value='50'></annotation>
</attribute>
<attribute id='80dd565a-8a2e-4661-b89b-5384ebafd73c' name='dataSource' columnName='data_source' title='数据来源' type='string' default='' precision='' isArray='false'>
<annotation id='f05b84c7-476d-4397-9d5e-2c37488d9c92' attributeId='f9a9d6f4-a208-45e5-9318-22af73e404ab' name='length' value='50'></annotation>
</attribute>
<attribute id='988d3d4c-1062-41e0-94b9-bd339718330d' name='reason' columnName='reason' title='原因' type='string' default='' precision='' isArray='false'>
<annotation id='d4ae7313-828a-48ff-84cf-d2b1db59a6c9' attributeId='107e0691-586b-49e8-bb75-372e56b01f43' name='length' value='50'></annotation>
</attribute>
<attribute id='e7ca1203-2dfe-4ef0-b6a6-c204aa9a04da' name='delReason' columnName='del_reason' title='删除原因' type='string' default='' precision='' isArray='false'>
<annotation id='23d02bbd-eabd-47b0-a1ea-674af1ee5695' attributeId='8378869d-f001-44fe-9837-a0ccada7d11c' name='length' value='50'></annotation>
</attribute>
<attribute id='76cb3a45-d1ef-4ac7-ade5-3c3c34c21811' name='methodType' columnName='method_type' title='数据方法类型 0:新增 1:删除' type='int' default='' precision='' isArray='false'>
<annotation id='363be135-5265-4354-acd3-09448a570214' attributeId='e5872b18-5a17-431f-a927-b41966b7b982' name='length' value='undefined'>
</annotation>
</attribute>
<attribute id='4cbbfe49-27b0-4439-b357-e6087c3c740b' name='approveStateDel' columnName='approve_state_del' title='删除审核状态 1:待审核 2:审核通过 3 驳回' type='int' default='' precision='' isArray='false'>
<annotation id='999a9b8c-80f4-4b9e-8cf6-2b6d841cb03f' attributeId='bd8184ee-3da7-4f72-a2c1-f44ab3094328' name='length' value='undefined'>
</annotation>
</attribute>
<hibernate>/xyst.dinas.sales/src/main/resources/config/SalesRecord.hbm.xml</hibernate>
</dataModel>
</content>
......
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/ShipQuantity.mk
......@@ -36,6 +36,10 @@
<attribute id='ede9a1dc-8cec-4978-96aa-602873d48f09' name='transportShipName' columnName='transport_ship_Name' title='运砂船' type='string' default='' precision='' isArray='false'>
<annotation id='42b07dc1-1859-4522-97ab-a821eda11c0f' attributeId='6cebbeb2-2f53-4b2d-beea-451ceb076044' name='length' value='50'/>
</attribute>
<attribute id='966c39b5-8bc0-4ca9-a151-373b02a4eed3' name='sandMiningArea' columnName='sand_mining_area_id' title='所属采区' type='com.xyst.dinas.biz.datamodel.SandMiningArea' default='' precision='' isArray='false'>
<annotation id='5fd9ba55-db5c-4bb6-b292-e18277e6c54e' attributeId='616b9c07-9791-435e-bfd3-989066a546eb' name='length' value='undefined'></annotation>
<annotation id='f6b6964d-bd09-4767-b380-40c4d93e8f87' attributeId='7837cb05-0429-4a74-bd4f-38a061ca5dfb' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='d18c33cf-39bf-4220-bff7-5428a68a5142' name='dinasType' columnName='dinas_type_id' title='砂石类型' type='com.xyst.dinas.biz.datamodel.DinasType' default='' precision='' isArray='false'>
<annotation id='7c09730e-4da9-45c6-9cbb-b37c22b88bbe' attributeId='90ab8c99-6c83-4a68-9e0f-e6bb303566af' name='length' value='undefined'></annotation>
<annotation id='12fbe06c-0562-4d5c-9ec1-23631daaaf54' attributeId='491dbd7e-00b3-4c12-b924-17ae623bbfdf' name='mappingType' value='many-to-one'></annotation>
......
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/query/SalesRecord.mk
......@@ -294,6 +294,52 @@
</ref>
<description></description>
</field>
<field title='数据来源'>
<name>dataSource</name>
<type>string</type>
<description></description>
</field>
<field title='原因'>
<name>reason</name>
<type>string</type>
<description></description>
</field>
<field title='删除原因'>
<name>delReason</name>
<type>string</type>
<description></description>
</field>
<field title='审批状态'>
<name>approveState</name>
<type>int</type>
<description></description>
</field>
<field title='方法类型'>
<name>methodType</name>
<type>int</type>
<description></description>
</field>
<field title='删除审核状态'>
<name>approveStateDel</name>
<type>int</type>
<description></description>
</field>
<field title='删除'>
<name>del</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/model/com/xyst/dinas/sales/query/ShipQuantity.mk
......@@ -117,6 +117,24 @@
<type>string</type>
<description></description>
</field>
<field title='所属采区唯一主键编码'>
<name>sandMiningArea.id</name>
<description>采砂区域</description>
<type>uuid</type>
<ref>
<name>com.xyst.dinas.biz.datamodel.SandMiningArea</name>
<type></type>
</ref>
</field>
<field title='所属采区名称'>
<name>sandMiningArea.sandMiningAreaName</name>
<description>所属采区名称</description>
<type>string</type>
<ref>
<name>com.xyst.dinas.biz.datamodel.SandMiningArea</name>
<type></type>
</ref>
</field>
<field title='砂石种类id'>
<name>dinasType.id</name>
<type>uuid</type>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ExceptionApprovalCheck.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-privilege">
<specification>1.0</specification>
<id>843c71cc-2c88-4dd7-9ce4-c9fd33470389</id>
<name>com.xyst.dinas.sales.auth.ExceptionApprovalCheck</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>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ExceptionApprovalList.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-privilege">
<specification>1.0</specification>
<id>367fd08f-ad86-4931-957e-b9f98cf8c66d</id>
<name>com.xyst.dinas.sales.auth.ExceptionApprovalList</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/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ExceptionCard.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-privilege">
<specification>1.0</specification>
<id>abf4d4f0-f3c4-404f-997c-396f005a9802</id>
<name>com.xyst.dinas.sales.auth.ExceptionCard</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>3</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ExceptionCreate.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-privilege">
<specification>1.0</specification>
<id>313913f0-ff31-4ecf-989c-78353a754d68</id>
<name>com.xyst.dinas.sales.auth.ExceptionCreate</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>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ExceptionDelete.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-privilege">
<specification>1.0</specification>
<id>de6beff4-ccb1-46e1-9df6-e95c3d3ef79d</id>
<name>com.xyst.dinas.sales.auth.ExceptionDelete</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>4</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ExceptionEdit.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-privilege">
<specification>1.0</specification>
<id>2d92b31f-31d1-447c-b00d-1de1e63a6ff9</id>
<name>com.xyst.dinas.sales.auth.ExceptionEdit</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>2</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ExceptionList.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-privilege">
<specification>1.0</specification>
<id>3e9ed943-d381-4291-828b-7f963715cdbf</id>
<name>com.xyst.dinas.sales.auth.ExceptionList</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/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/CoefficientOrPrice$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>51def093-e3b9-4121-8cc2-2aa74442d430</id>
<id>ff252764-684e-4a1c-8dc4-e8ae9be96221</id>
<name>com.xyst.dinas.sales.bill.CoefficientOrPrice$sequence</name>
<title>折方系数$sequence</title>
<description>折方系数</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/CoefficientOrPrice$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>0e4cf72c-5f9a-4a8f-ac1c-bdc409f3c67d</id>
<id>dc3641eb-3c2e-4b2a-809e-75918d8de485</id>
<name>com.xyst.dinas.sales.bill.CoefficientOrPrice$serial</name>
<title>折方系数$serial</title>
<description>折方系数</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/CoefficientOrPrice.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>8bb674be-6520-4e53-8aec-ceb5324e3d08</id>
<id>042bb8a6-0510-4743-99a2-ee67849c0083</id>
<name>com.xyst.dinas.sales.bill.CoefficientOrPrice</name>
<title>折方系数</title>
<description>折方系数</description>
......
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>9e32379c-6520-42b5-b5f1-d0be0612ef1f</id>
<id>301746c5-745d-444e-a137-06e6e89343d9</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>bb4d9dbc-7e5a-4af9-a927-157ac67bae6a</id>
<id>f54aea81-d428-45bb-83eb-ad3fd31aeb70</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>4af6ee4f-1efe-496d-9873-bebee54f7b60</id>
<id>004d95cc-bf1f-4058-940f-2d6b36e1044b</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>1232ebe3-2332-4a4e-b2fc-0c7ce5208264</id>
<id>a00450b4-1667-495b-93c4-d9bba2eb01d4</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>bb8d5d82-a778-4637-8853-42386e48b295</id>
<id>2986ba9a-f4b4-45df-ac73-facc6f39a161</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>ae71c114-c0f3-423a-bd4e-54993231a96c</id>
<id>cffd3a4e-f920-4c4c-94e0-2834863b2764</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
<?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>bbfd31d3-f010-4304-a7a8-25d00948360e</id>
<id>9ffc7bf0-cdfc-4bc7-bfd7-e348bd9fd045</id>
<name>com.xyst.dinas.sales.bill.SalesPlanTemp$sequence</name>
<title>临时销售计划$sequence</title>
<define>bcp.sequence</define>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp$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>c2304b4b-ec3a-4bd4-adc3-7221a84d9515</id>
<id>23a13afe-7da5-43f1-a134-96ea5a457508</id>
<name>com.xyst.dinas.sales.bill.SalesPlanTemp$serial</name>
<title>临时销售计划$serial</title>
<define>bcp.serial</define>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp.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>274e1c1a-e5e2-4f41-8e46-b6d91eeda43a</id>
<id>581cc94c-1082-480e-8d0c-bda7a5256aa5</id>
<name>com.xyst.dinas.sales.bill.SalesPlanTemp</name>
<title>临时销售计划</title>
<define>bcp.biz.Biztype</define>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/ShipQuantity$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>b77e29a3-4adb-44b0-abd0-aff3fce97110</id>
<id>246c9383-3efa-40db-839a-fd19e0131d87</id>
<name>com.xyst.dinas.sales.bill.ShipQuantity$sequence</name>
<title>运船量方$sequence</title>
<description>运船量方</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/ShipQuantity$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>a15e721b-043b-49f8-83b5-8591003b195d</id>
<id>a84a60f3-55d2-4995-b295-1e44cf0ad0f5</id>
<name>com.xyst.dinas.sales.bill.ShipQuantity$serial</name>
<title>运船量方$serial</title>
<description>运船量方</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/ShipQuantity.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>e97b46ec-daf5-4d26-b5b0-e9ef80af4975</id>
<id>7817b4fc-6cdc-4229-9a5e-00f2b26d2b22</id>
<name>com.xyst.dinas.sales.bill.ShipQuantity</name>
<title>运船量方</title>
<description>运船量方</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/VehicleAmountParty$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>c3553f15-3381-40b3-a961-1ff6db94d0ef</id>
<id>6a4de93b-77da-4e8a-82e2-cb59e61f5d30</id>
<name>com.xyst.dinas.sales.bill.VehicleAmountParty$sequence</name>
<title>车辆量方$sequence</title>
<description>车辆量方</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/VehicleAmountParty$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>6e8a3733-bf3b-4010-9424-b014a38323a1</id>
<id>7cd00f77-5428-4cec-8074-3ef756cb3c44</id>
<name>com.xyst.dinas.sales.bill.VehicleAmountParty$serial</name>
<title>车辆量方$serial</title>
<description>车辆量方</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/VehicleAmountParty.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>69fb3580-a72e-4a5d-8758-f28d80ae7289</id>
<id>239717be-513e-4020-9f96-267d132880fa</id>
<name>com.xyst.dinas.sales.bill.VehicleAmountParty</name>
<title>车辆量方</title>
<description>车辆量方</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/SalesRecord.jmx
......@@ -704,6 +704,113 @@
<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>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>data_source</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>80dd565a-8a2e-4661-b89b-5384ebafd73c</m:id>
<m:name>dataSource</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>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>reason</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>988d3d4c-1062-41e0-94b9-bd339718330d</m:id>
<m:name>reason</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>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>del_reason</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>e7ca1203-2dfe-4ef0-b6a6-c204aa9a04da</m:id>
<m:name>delReason</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>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>method_type</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>76cb3a45-d1ef-4ac7-ade5-3c3c34c21811</m:id>
<m:name>methodType</m:name>
<m:title>数据方法类型 0:新增 1:删除</m:title>
<m:type>int</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>approve_state_del</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>4cbbfe49-27b0-4439-b357-e6087c3c740b</m:id>
<m:name>approveStateDel</m:name>
<m:title>删除审核状态 1:待审核 2:审核通过 3 驳回</m:title>
<m:type>int</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
</m:attributes>
</m:class>
</content>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/ShipQuantity.jmx
......@@ -20,6 +20,7 @@
<dependency>com.xyst.dinas.project.datamodel.PurchaseSandCompany</dependency>
<dependency>javax.persistence.Column</dependency>
<dependency>javax.persistence.Table</dependency>
<dependency>com.xyst.dinas.biz.datamodel.SandMiningArea</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
<dependency>com.xyst.dinas.project.datamodel.ProjectFiled</dependency>
<content>
......@@ -180,6 +181,32 @@
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>sand_mining_area_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>966c39b5-8bc0-4ca9-a151-373b02a4eed3</m:id>
<m:name>sandMiningArea</m:name>
<m:title>所属采区</m:title>
<m:type>com.xyst.dinas.biz.datamodel.SandMiningArea</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>dinas_type_id</m:value>
</m:property>
<m:property>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/SalesRecord.jmx
......@@ -389,6 +389,76 @@
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>dataSource</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>reason</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>delReason</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>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>methodType</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>approveStateDel</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>del</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>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/ShipQuantity.jmx
......@@ -147,6 +147,26 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>sandMiningArea.id</m:name>
<m:title>所属采区唯一主键编码</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.SandMiningArea</m:name>
<m:type></m:type>
</m:ref>
<m:desc>采砂区域</m:desc>
</m:field>
<m:field>
<m:name>sandMiningArea.sandMiningAreaName</m:name>
<m:title>所属采区名称</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.SandMiningArea</m:name>
<m:type></m:type>
</m:ref>
<m:desc>所属采区名称</m:desc>
</m:field>
<m:field>
<m:name>dinasType.id</m:name>
<m:title>砂石种类id</m:title>
<m:type>uuid</m:type>
......
backend/xyst.dinas.sales/src/main/resources/config/SalesRecord.hbm.xml
......@@ -111,5 +111,35 @@
<property name="dealBillCode" type="nstring" not-null="false">
<column name="deal_bill_code" length="50"></column>
</property>
<property name="dataSource" type="nstring" not-null="false">
<column name="data_source" length="50">
<comment>数据来源</comment>
</column>
</property>
<property name="reason" type="nstring" not-null="false">
<column name="reason" length="50">
<comment>原因</comment>
</column>
</property>
<property name="delReason" type="nstring" not-null="false">
<column name="del_reason" length="50">
<comment>删除原因</comment>
</column>
</property>
<property name="methodType" type="integer" not-null="false">
<column name="method_type">
<comment>数据方法类型 0:新增 1:删除</comment>
</column>
</property>
<property name="approveStateDel" type="integer" not-null="false">
<column name="approve_state_del">
<comment>删除审核状态 1:待审核 2:审核通过 3 驳回</comment>
</column>
</property>
</class>
</hibernate-mapping>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/resources/config/ShipQuantity.hbm.xml
......@@ -66,6 +66,11 @@
<comment>运砂船</comment>
</column>
</property>
<many-to-one name="sandMiningArea" entity-name="com.xyst.dinas.biz.datamodel.SandMiningArea" fetch="select">
<column name="sand_mining_area_id" not-null="false">
<comment>所属采区</comment>
</column>
</many-to-one>
<many-to-one name="dinasType" entity-name="com.xyst.dinas.biz.datamodel.DinasType" fetch="select">
<column name="dinas_type_id" not-null="false">
<comment>砂石类型</comment>
......
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