UDI
/
spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

任务modify，权限验证，udims

Browse Source
master
anthonyywj2 4 years ago
parent 49aca686d3
commit c3afd4b83e
6 changed files with 113 additions and 46 deletions
Show Stats Download Patch File Download Diff File

4
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java
Unescape Escape View File

@ -63,14 +63,14 @@ public class BussinessChangeTypeController {
bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
} else if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) {
BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity();
bussinessChangeTypeEntity1.setIntro("出库自动补\"采购入库单\"");
bussinessChangeTypeEntity1.setIntro("出库自动补\"入库单\"");
bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_IN);
bussinessChangeTypeEntity1.setIndex(1);
bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction());
bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1);
BussinessChangeTypeEntity bussinessChangeTypeEntity2 = new BussinessChangeTypeEntity();
bussinessChangeTypeEntity2.setIntro("出库自动补\"寄售转入单\"");
bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_ADV_IN);
bussinessChangeTypeEntity2.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_ADV_IN);
bussinessChangeTypeEntity2.setIndex(2);
bussinessChangeTypeEntity2.setAction(bussinessTypeFilterRequest.getAction());
bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity2);

2
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpExportLogController.java
Unescape Escape View File

@ -71,7 +71,7 @@ public class CorpExportLogController {
}
//往来单位excel文件下载
//@AuthRuleAnnotation("")
// @AuthRuleAnnotation("")
@GetMapping("/udiwms/corps/exportLog/download")
public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) {

6
api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostUdimsOrderRequest.java
Unescape Escape View File

@ -12,8 +12,9 @@ public class PostUdimsOrderRequest {
List<OrderBean> orderBeans;
private String customerId;
@Data
public static class OrderBean {
private String id;
private String orderId;
private String corpOrderId;
private String action;
private String actDate;
@ -22,9 +23,9 @@ public class PostUdimsOrderRequest {
private String fromCorpId;
private String fromCorp;
private String remark;
private List<CodeBean> codes;
@Data
public static class CodeBean {
private String action;
private String mainAction;
@ -55,4 +56,5 @@ public class PostUdimsOrderRequest {
}
}

90
api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java
Unescape Escape View File

@ -37,6 +37,7 @@ import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.service.thrsys.ThrDataService;
import com.glxp.sale.admin.service.thrsys.ThrOrderService;
import com.glxp.sale.admin.util.CustomUtil;
import com.glxp.sale.admin.util.DateUtil;
import com.glxp.sale.admin.util.FilterUdiUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@ -44,6 +45,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@ -171,8 +173,8 @@ public class IoTransInoutService {
}
WarehouseEntity warehouseEntity = warehouseEntityList.get(0);
String orderId = "SM"+
System.currentTimeMillis() + i + "";
String orderId = "SM" +
CustomUtil.getId() + i + "";
OrderEntity orderSaveRequest = new OrderEntity();
orderSaveRequest.setId(orderId);
if (warehouseEntity.getActDate() != null) {
@ -219,6 +221,50 @@ public class IoTransInoutService {
@Async
public void createOrderUdims(PostUdimsOrderRequest postUdimsOrderRequest) {
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(postUdimsOrderRequest.getCustomerId()));
List<PostUdimsOrderRequest.OrderBean> orderBeans = postUdimsOrderRequest.getOrderBeans();
if (orderBeans != null) {
for (PostUdimsOrderRequest.OrderBean orderBean : orderBeans) {
OrderEntity orderEntity = new OrderEntity();
String orderId = "SM" +
CustomUtil.getId() + "";
BeanUtils.copyProperties(orderBean, orderEntity);
orderEntity.setCorpOrderId(orderBean.getOrderId());
orderEntity.setFromCorpId(companyEntity.getUnitIdFk());
orderEntity.setFromCorp(companyEntity.getCompanyName());
orderEntity.setFromType(ConstantStatus.FROM_UDIMS);
orderEntity.setReceiveStatus(0);
orderEntity.setId(orderId);
orderEntity.setAction(ConstantType.TYPE_PUT);
orderEntity.setAction("SC54593439742");
orderEntity.setActDate(DateUtil.getDate());
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
orderEntity.setExportStatus(ConstantStatus.ORDER_EXPORT_UN);
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
orderEntity.setSignStatus(ConstantStatus.ORDER_SIGN_UN);
orderService.insertOrder(orderEntity);
List<PostUdimsOrderRequest.OrderBean.CodeBean> codeBeans = orderBean.getCodes();
List<WarehouseEntity> warehouseEntities = new ArrayList<>();
for (PostUdimsOrderRequest.OrderBean.CodeBean codeBean : codeBeans) {
WarehouseEntity warehouseEntity = new WarehouseEntity();
BeanUtils.copyProperties(codeBean, warehouseEntity);
warehouseEntity.setFromCorp(companyEntity.getCompanyName());
warehouseEntity.setFromCorpId(companyEntity.getUnitIdFk());
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findDefault(false, true);
warehouseEntity.setLocStorageCode(invWarehouseEntity.getCode());
warehouseEntity.setOrderId(orderId);
warehouseEntities.add(warehouseEntity);
}
for (WarehouseEntity temp : warehouseEntities) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(temp.getCode());
temp.setNameCode(udiEntity.getUdi());
}
codesTempService.insertCodesTemp(warehouseEntities);
}
}
}
@ -244,13 +290,23 @@ public class IoTransInoutService {
}
public void transInout(OrderEntity orderEntity) {
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
if (orderEntity.getFromCorp() == null) {
orderEntity.setRemark("未选择往来单位");
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_FAIL);
orderService.updateOrder(orderEntity);
return;
} else if (orderEntity.getFromCorpId() == null) {
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) {
BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity();
basicUnitMaintainEntity.setErpId(CustomUtil.getUnitId());
basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SICK);
basicUnitMaintainEntity.setName(orderEntity.getFromCorp());
orderEntity.setFromCorpId(basicUnitMaintainEntity.getErpId());
orderService.updateOrder(orderEntity);
basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
}
BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByName(orderEntity.getFromCorp());
if (basicUnitMaintainEntity == null) {
orderEntity.setRemark("未选择往来单位");
@ -261,16 +317,6 @@ public class IoTransInoutService {
orderEntity.setFromCorpId(basicUnitMaintainEntity.getErpId());
}
}
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) {
BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity();
basicUnitMaintainEntity.setErpId(CustomUtil.getUnitId());
basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SICK);
basicUnitMaintainEntity.setName(orderEntity.getFromCorp());
orderEntity.setFromCorpId(basicUnitMaintainEntity.getErpId());
orderService.updateOrder(orderEntity);
basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
}
// if (!Constant.SYSTEM_CUSTOMER_ID.equals(orderEntity.getFromCorpId())) {
@ -322,7 +368,7 @@ public class IoTransInoutService {
orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "该产品不允许以使用单元入库！");
return;
}
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(udiRelevanceResponse.getId() + "", warehouseEntity.getFromCorpId());
if (companyProductRelevanceEntity == null) {
orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
@ -371,8 +417,9 @@ public class IoTransInoutService {
warehouseEntity.setStatus(0);
if (warehouseEntity.getRelId() == null)
warehouseEntity.setRelId(udiRelevanceEntities.get(0).getId() + "");
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
String originSupId = checkOriginExitSup(warehouseEntity);
if (originSupId == null) {
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
String supId = null;
if (originSupId == null) {
supId = checkExitSup(warehouseEntity.getRelId());
@ -391,6 +438,8 @@ public class IoTransInoutService {
}
warehouseEntity.setSupId(supId);
}
}
}
warehouseService.updateCode(warehouseEntity);
@ -489,7 +538,18 @@ public class IoTransInoutService {
CompanyEntity companyEntity = companyService.findCompany(companyProductRelevanceEntity.getCustomerId());
return companyEntity.getUnitIdFk();
} else if (companyProductRelevanceEntities != null && companyProductRelevanceEntities.size() > 1) {
String unitFk = companyProductRelevanceEntities.get(0).getUnitFk();
boolean isMuti = false;
for (CompanyProductRelevanceEntity companyProductRelevanceEntity : companyProductRelevanceEntities) {
if (!unitFk.equals(companyProductRelevanceEntity.getUnitFk())) {
isMuti = true;
break;
}
}
if (isMuti)
return "MUTI"; //绑定多个供应商
else
return unitFk;
}
return null;
}

6
api-admin/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml
Unescape Escape View File

@ -18,9 +18,9 @@
<set>
<if test="appid != null">appid=#{appid},</if>
<if test="name != null">name=#{name},</if>
<if test="apiKey != null">api_Key=#{apiKey},</if>
<if test="secretKey != null">secret_Key=#{secretKey},</if>
<if test="createDate != null">create_Date=#{createDate}</if>
<if test="apiKey != null">apiKey=#{apiKey},</if>
<if test="secretKey != null">secretKey=#{secretKey},</if>
<if test="createDate != null">createDate=#{createDate}</if>
<if test="customerId != null">customerId=#{customerId}</if>
<if test="companyName != null">companyName=#{companyName}</if>
</set>

21
api-admin/src/main/resources/mybatis/mapper/info/ScheduleDao.xml
Unescape Escape View File

@ -7,20 +7,25 @@
<insert id="insertScheduled" keyProperty="id"
parameterType="com.glxp.sale.admin.entity.info.ScheduledEntity">
insert INTO scheduled
(cronName,cron,customerId)
values
(
#{cronName},
(cronName, cron, customerId)
values (#{cronName},
#{cron},
#{customerId}
)
#{customerId})
</insert>
<delete id="deleteScheduled" parameterType="java.lang.String">
delete from scheduled where id = #{id}
delete
from scheduled
where id = #{id}
</delete>
<update id="modifyScheduled" parameterType="com.glxp.sale.admin.entity.info.ScheduledEntity">
UPDATE sys_scheduled
<set>
<if test="cron != null">cron=#{cron},</if>
</set>
WHERE cronName=#{cronName}
</update>
<select id="findScheduled" parameterType="com.glxp.sale.admin.req.udid.ScheduledRequest"
resultType="com.glxp.sale.admin.entity.info.ScheduledEntity">

Write Preview
Loading…
Cancel
Save