Merge remote-tracking branch 'origin/master'

master
MrZhai 3 years ago
commit 26fe2dbd33

@ -88,6 +88,7 @@ public class ConstantStatus {
public static final int FROM_PC = 5; //pc端扫码精灵
public static final int FROM_CHANGE = 6; //单据流转
public static final int FROM_UDISP = 7; //udi供应商平台
public static final int FROM_PEACE_CHANGE = 8; //平衡补单
//DI类型

@ -72,7 +72,7 @@ public class BussinessChangeTypeController {
bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1);
BussinessChangeTypeEntity bussinessChangeTypeEntity2 = new BussinessChangeTypeEntity();
bussinessChangeTypeEntity2.setIntro("出库自动补\"调拨入库单\"");
bussinessChangeTypeEntity2.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_IN);
bussinessChangeTypeEntity2.setChangeType(ConstantStatus.ORDER_CHANGE_INNOR_NORMAL_IN);
bussinessChangeTypeEntity2.setIndex(1);
bussinessChangeTypeEntity2.setAction(bussinessTypeFilterRequest.getAction());
bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity2);
@ -97,6 +97,19 @@ public class BussinessChangeTypeController {
return ResultVOUtils.success(bussinessTypeEntities);
}
@AuthRuleAnnotation("")
@PostMapping("/spms/bussinessChangeType/remove")
public BaseResponse removeBussinessType(@RequestBody BussinessChangeTypeEntity deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String action = deleteRequest.getScAction();
bussinessChangeTypeService.deleteByAction(action);
return ResultVOUtils.success("删除成功");
}
@AuthRuleAnnotation("")
@PostMapping("/spms/bussinessChangeType/delete")
public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {

@ -236,6 +236,26 @@ public class UdiRelevanceController {
return ResultVOUtils.success("更新成功");
}
//新增或修改关联
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/check/udi")
public BaseResponse checkUdi(@RequestBody CombineRequest combineRequest) {
List<String> keys = combineRequest.getKeys();
if (keys != null && keys.size() > 0) {
List<UdiRelevanceEntity> datas = udiRelevanceService.batchSelectByUuid(keys);
if (datas.isEmpty()) {
return ResultVOUtils.success("无被选入!");
} else {
return ResultVOUtils.error(499, "所选产品DI已经被"+"第三方产品ID"+"绑定,您确定继续对照");
}
}
return ResultVOUtils.success("合并成功");
}
//新增或修改关联
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/revleance")

@ -445,8 +445,13 @@ public class OrderController {
}
StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(billNo);
if(StrUtil.isEmpty(stockOrderEntity.getSupplementNo())){
return orderService.supplementOrder(stockOrderEntity.getBillNo(), stockOrderEntity.getOrderIdFk());
}else {
return ResultVOUtils.error(500,"当前单据已补单,请勿重复补单");
}
}

@ -193,6 +193,10 @@ public class CheckOrderUtils {
if (bussinessTypeEntity.isSecCheckChange()) {
return ConstantStatus.SORDER_CHECKED;
}
}else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_PEACE_CHANGE) {
if (bussinessTypeEntity.isSecCheckBalacne()) {
return ConstantStatus.SORDER_CHECKED;
}
}
} else {
return ConstantStatus.SORDER_DELIVER;

@ -7,6 +7,7 @@ import com.glxp.sale.admin.constant.ConstantType;
import com.glxp.sale.admin.entity.info.CompanyEntity;
import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
import com.glxp.sale.admin.entity.inventory.InvProductEntity;
import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.sale.admin.req.inout.DeleteRequest;
import com.glxp.sale.admin.req.inventory.FilterInvProductDetailRequest;
import com.glxp.sale.admin.req.inventory.FilterInvProductRequest;
@ -18,6 +19,7 @@ import com.glxp.sale.admin.res.inventory.InvProductStatResponse;
import com.glxp.sale.admin.service.info.CompanyService;
import com.glxp.sale.admin.service.inventory.InvPreProductDetailService;
import com.glxp.sale.admin.service.inventory.InvPreProductService;
import com.glxp.sale.admin.service.inventory.InvWarehouseService;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
@ -42,6 +44,8 @@ public class InvPreProductsController {
InvPreProductDetailService invProductDetailService;
@Resource
private CompanyService companyService;
@Resource
private InvWarehouseService invWarehouseService;
@AuthRuleAnnotation("")
@GetMapping("spms/pre/inv/products/filter")
@ -53,6 +57,7 @@ public class InvPreProductsController {
} else {
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(filterInvProductRequest.getCustomerId()));
filterInvProductRequest.setSupId(companyEntity.getUnitIdFk());
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findDefault(true, true);
filterInvProductRequest.setCustomerId(null);
}
List<InvProductResponse> invProductResponses = invProductService.filterJoinInvProduct(filterInvProductRequest);

@ -10,6 +10,7 @@ import com.glxp.sale.admin.entity.info.CompanyEntity;
import com.glxp.sale.admin.entity.inout.OrderEntity;
import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
import com.glxp.sale.admin.entity.inventory.InvProductEntity;
import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.sale.admin.entity.udid.UdiEntity;
import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.req.inventory.FilterCodeTraceRequest;
@ -27,6 +28,7 @@ import com.glxp.sale.admin.service.info.CompanyService;
import com.glxp.sale.admin.service.inout.OrderService;
import com.glxp.sale.admin.service.inventory.InvProductDetailService;
import com.glxp.sale.admin.service.inventory.InvProductService;
import com.glxp.sale.admin.service.inventory.InvWarehouseService;
import com.glxp.sale.admin.util.FilterUdiUtils;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
@ -61,6 +63,8 @@ public class InvProductsController {
private UdiInfoService udiInfoService;
@Resource
private CompanyService companyService;
@Resource
private InvWarehouseService invWarehouseService;
@AuthRuleAnnotation("")
@GetMapping("spms/inv/products/filter")
@ -72,6 +76,8 @@ public class InvProductsController {
} else {
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(filterInvProductRequest.getCustomerId()));
filterInvProductRequest.setSupId(companyEntity.getUnitIdFk());
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findDefault(false, true);
filterInvProductRequest.setInvStorageCode(invWarehouseEntity.getCode());
filterInvProductRequest.setCustomerId(null);
}
// filterInvProductRequest.setGroupType("invStorageCode");

@ -99,7 +99,10 @@ public class SystemParamConfigController {
//出入库新增单据校验
if (systemParamConfigSaveRequest.getParamKey().equals("io_transInout_interval")) {
try {
int time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue());
int time = 5;
if (!"0".equals(systemParamConfigSaveRequest.getParamValue())) {
time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue());
}
String cronStr = CronUtils.parseMinuteIntervel(time);
ScheduledEntity scheduledEntity = new ScheduledEntity();
scheduledEntity.setCron(cronStr);
@ -110,7 +113,10 @@ public class SystemParamConfigController {
}
} else if (systemParamConfigSaveRequest.getParamKey().equals("io_erpcheck_interval")) {
try {
int time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue());
int time = 5;
if (!"0".equals(systemParamConfigSaveRequest.getParamValue())) {
time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue());
}
String cronStr = CronUtils.parseMinuteIntervel(time);
ScheduledEntity scheduledEntity = new ScheduledEntity();
scheduledEntity.setCron(cronStr);
@ -121,7 +127,10 @@ public class SystemParamConfigController {
}
} else if (systemParamConfigSaveRequest.getParamKey().equals("supplement_order_interval")) {
try {
int time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue());
int time = 5;
if (!"0".equals(systemParamConfigSaveRequest.getParamValue())) {
time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue());
}
String cornStr = CronUtils.parseMinuteIntervel(time);
ScheduledEntity scheduledEntity = new ScheduledEntity();
scheduledEntity.setCron(cornStr);

@ -19,4 +19,7 @@ public interface BussinessChangeTypeDao {
boolean insertBusChangeTypee(BussinessChangeTypeEntity bussinessTypeEntity);
boolean deleteById(@Param("id") String id);
boolean deleteByAction(@Param("scAction") String scAction);
}

@ -13,7 +13,6 @@ public class BussinessLocalTypeEntity {
private String mainAction;
private String localName;
private String remark;
private Boolean enable;
private boolean checkEnable;
private boolean advanceType;
private boolean changeEnable;

@ -28,6 +28,7 @@ public class BussinessTypeEntity {
private boolean checkWebNew;
private boolean checkChange;
private boolean secCheckUdims;
private boolean secCheckPdaEd;
private boolean secCheckPdaUn;
@ -35,6 +36,9 @@ public class BussinessTypeEntity {
private boolean secCheckWebNew;
private boolean secCheckChange;
private boolean checkBalacne;
private boolean secCheckBalacne;
private int corpType;
private String storageCode;

@ -37,6 +37,10 @@ public class UdiInfoEntity {
private String manufactory;
private String measname;
private Integer productType;
private String scbssfbhph;
private String scbssfbhxlh;
private String scbssfbhscrq;
private String scbssfbhsxrq;
//本地生成信息

@ -50,6 +50,7 @@ public class FilterUdiInfoRequest extends ListPageRequest {
private String sptm;
private String unionFilterStr;//产品名称,规格,批文,生产厂家联合查询
private Boolean isDisable;
}

@ -47,4 +47,8 @@ public class BussinessTypResponse {
//启用默认补单
private boolean enableSupplementOrder;
private boolean checkBalacne;
private boolean secCheckBalacne;
}

@ -56,6 +56,11 @@ public class UdiRelevanceResponse {
private Integer lockStatus;
private String udplatCode;
private Boolean isAdavence;
private String scbssfbhph;
private String scbssfbhxlh;
private String scbssfbhscrq;
private String scbssfbhsxrq;
public int getBhzxxsbzsl() {
if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {

@ -23,4 +23,16 @@ public class StockOrderDetailResponse {
private String ylqxzcrbarmc;
private String zczbhhzbapzbh;
private BigDecimal price;
//销售清单号(第二票)
private String secSalesListNo;
//销售发票号(第一票)
private String firstSalesInvNo;
//销售发票号(第二票)
private String secSalesInvNo;
//开票日期
private String invoiceDate;
}

@ -19,4 +19,5 @@ public interface BussinessChangeTypeService {
boolean deleteById(String id);
boolean deleteByAction(String scAction);
}

@ -4,6 +4,7 @@ package com.glxp.sale.admin.service.basic;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -23,6 +24,8 @@ public interface UdiRelevanceService {
boolean isExitByUuid(String uuid);
List<UdiRelevanceEntity> batchSelectByUuid(List<String> uuids);
List<UdiRelevanceEntity> selectByUuid(String uuid);
UdiRelevanceEntity selectById(String id);

@ -50,4 +50,9 @@ public class BussinessChangeTypeServiceaImpl implements BussinessChangeTypeServi
public boolean deleteById(String id) {
return bussinessChangeTypeDao.deleteById(id);
}
@Override
public boolean deleteByAction(String scAction) {
return bussinessChangeTypeDao.deleteByAction(scAction);
}
}

@ -95,6 +95,11 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
return false;
}
@Override
public List<UdiRelevanceEntity> batchSelectByUuid(List<String> uuids) {
return udiRelevanceDao.batchSelectByUuid(uuids);
}
@Override
public List<UdiRelevanceEntity> selectByUuid(String uuid) {
return udiRelevanceDao.selectByUuid(uuid);

@ -214,7 +214,7 @@ public class OrderServiceImpl implements OrderService {
supplementOrder.setLocStorageCode(order.getFromCorpId());
String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId());
supplementOrder.setFromCorp(name);
supplementOrder.setFromType(ConstantStatus.FROM_CHANGE);
supplementOrder.setFromType(ConstantStatus.FROM_PEACE_CHANGE);
BussinessTypeEntity supplementType = bussinessTypeDao.selectByAction(bussinessTypeEntity.getSupplementOrderType());
supplementOrder.setMainAction(supplementType.getMainAction());

@ -1070,14 +1070,12 @@ public class InvProductsTrService {
public InvProductDetailEntity filterInvByCode(List<InvProductDetailEntity> invProductDetailEntities, String
code) {
for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) {
if (invProductDetailEntity.getOriginCode().equals(code)) {
return invProductDetailEntity;
}
}
return null;
}
public int getActCount(WarehouseEntity warehouseEntity) {

@ -41,5 +41,6 @@ public class IoErpCheckTask implements SchedulingConfigurer {
private void process() {
logger.info("定时校验ERP单---暂停");
// ioTransInoutService.checkOrder();
}
}

@ -18,6 +18,7 @@ import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
import com.glxp.sale.admin.entity.inout.*;
import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.entity.udid.UdiEntity;
import com.glxp.sale.admin.httpclient.ErpOrderClient;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
@ -51,6 +52,7 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
@ -114,7 +116,7 @@ public class IoTransInoutService {
myErpOrderService.deleteByOrderId(postOrderRequest.getOldOrderId());
}
WarehouseEntity warehouseEntity = warehouseEntityList.get(0);
String orderId = System.currentTimeMillis() + i + "";
String orderId = "SM" + CustomUtil.getId();
OrderEntity orderSaveRequest = new OrderEntity();
orderSaveRequest.setId(orderId);
if (warehouseEntity.getActDate() != null) {
@ -175,8 +177,8 @@ public class IoTransInoutService {
}
WarehouseEntity warehouseEntity = warehouseEntityList.get(0);
String orderId = "SM" +
CustomUtil.getId() + i + "";
String orderId = "SM" + CustomUtil.getId() + i + "";
OrderEntity orderSaveRequest = new OrderEntity();
orderSaveRequest.setId(orderId);
if (warehouseEntity.getActDate() != null) {
@ -366,6 +368,38 @@ public class IoTransInoutService {
return;
}
//近效期提醒:
SystemParamConfigEntity recentParamConfigEntity = systemParamConfigService.selectByParamKey("recent_date_tip");
int recent = Integer.parseInt(recentParamConfigEntity.getParamValue());
if (recent > 0) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode());
if (udiEntity.getExpireDate() != null) {
String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = DateUtil.parseDateExpire(expireDate);
if (expireTime - System.currentTimeMillis() < recent * 24 * 60 * 60 * 1000) {
orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
orderService.updateRemark(orderEntity.getId(), "udi码" + warehouseEntity.getCode() + "临近过期!");
return;
}
}
}
//过期提醒:
SystemParamConfigEntity expireParamConfigEntity = systemParamConfigService.selectByParamKey("expire_date_tip");
if (!"0".equals(expireParamConfigEntity.getParamValue())) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode());
if (udiEntity.getExpireDate() != null) {
String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = DateUtil.parseDateExpire(expireDate);
if (expireTime - System.currentTimeMillis() < 0) {
orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
orderService.updateRemark(orderEntity.getId(), "udi码" + warehouseEntity.getCode() + "已经过期!");
return;
}
}
}
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.selectAllByNameCode(warehouseEntity.getNameCode());
if (udiRelevanceResponses.size() == 1) {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0);
@ -500,6 +534,11 @@ public class IoTransInoutService {
unCheckFinish(orderEntity, warehouseEntityList);
return;
}
} else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_PEACE_CHANGE) {
if (!bussinessTypeEntity.isCheckBalacne()) {
unCheckFinish(orderEntity, warehouseEntityList);
return;
}
}
genOrderDetail(warehouseEntityList);
checkMutiDi(orderEntity.getId(), bussinessTypeEntity); //校验一个DI是否绑定多个产品ID

@ -2,8 +2,10 @@ package com.glxp.sale.admin.thread;
import com.glxp.sale.admin.dao.info.ScheduledDao;
import com.glxp.sale.admin.entity.info.ScheduledEntity;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.httpclient.UdiDlHttpClient;
import com.glxp.sale.admin.req.udid.ScheduledRequest;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.EnableScheduling;
@ -24,6 +26,8 @@ public class IoTransInoutTask implements SchedulingConfigurer {
protected ScheduledDao scheduledDao;
@Resource
private IoTransInoutService ioTransInoutService;
@Resource
SystemParamConfigService systemParamConfigService;
@Override
public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
@ -42,7 +46,11 @@ public class IoTransInoutTask implements SchedulingConfigurer {
private void process() {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("io_transInout_interval");
if (!"0".equals(systemParamConfigEntity.getParamValue())) {
logger.info("定时重码校验");
ioTransInoutService.transInout();
}
}
}

@ -4,10 +4,12 @@ import cn.hutool.core.collection.CollUtil;
import com.glxp.sale.admin.dao.info.ScheduledDao;
import com.glxp.sale.admin.entity.info.ScheduledEntity;
import com.glxp.sale.admin.entity.inout.StockOrderEntity;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.req.udid.ScheduledRequest;
import com.glxp.sale.admin.res.inout.StockOrderResponse;
import com.glxp.sale.admin.service.inout.OrderService;
import com.glxp.sale.admin.service.inout.StockOrderService;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.SchedulingConfigurer;
@ -33,7 +35,8 @@ public class SupplementOrderTask implements SchedulingConfigurer {
StockOrderService stockOrderService;
@Resource
OrderService orderService;
@Resource
SystemParamConfigService systemParamConfigService;
@Override
public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
@ -51,6 +54,9 @@ public class SupplementOrderTask implements SchedulingConfigurer {
}
private void process() {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("supplement_order_interval");
if (!"0".equals(systemParamConfigEntity.getParamValue())) {
log.info("开始扫描补单数据");
//计数器
AtomicInteger counter = new AtomicInteger(0);
@ -70,3 +76,6 @@ public class SupplementOrderTask implements SchedulingConfigurer {
}
}

@ -150,6 +150,16 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils {
}
public static Long parseDateExpire(String str) {
try {
return DateUtil.parseDate(str, "yyyyMMdd").getTime();
} catch (ParseException e) {
e.printStackTrace();
}
return 0l;
}
/**
*
*

@ -47,6 +47,13 @@
</delete>
<delete id="deleteByAction" parameterType="Map">
DELETE
FROM basic_bustype_pre
WHERE scAction = #{scAction}
</delete>
<select id="selectById" parameterType="Map" resultType="com.glxp.sale.admin.entity.basic.BussinessChangeTypeEntity">
select *
FROM basic_bustype_pre

@ -13,9 +13,6 @@
<if test="action != ''and action != null">
AND action LIKE concat(#{action},'%')
</if>
<if test="enabled != ''and enabled != null">
AND enable =#{enabled}
</if>
<if test="originAction != ''and originAction != null">
AND originAction =#{originAction}
</if>
@ -44,9 +41,6 @@
<if test="action != ''and action != null">
AND basic_bustype_local.action LIKE concat(#{action},'%')
</if>
<if test="enabled != ''and enabled != null">
AND basic_bustype_local.enable =#{enabled}
</if>
<if test="enabled != ''and enabled != null">
AND basic_bussiness_type.enable =#{enabled}
</if>
@ -76,9 +70,6 @@
<if test="action != ''and action != null">
AND basic_bustype_local.action LIKE concat(#{action},'%')
</if>
<if test="enabled != ''and enabled != null">
AND basic_bustype_local.enable =#{enabled}
</if>
<if test="enabled != ''and enabled != null">
AND basic_bussiness_type.enable =#{enabled}
</if>
@ -89,6 +80,7 @@
AND inv_warehouse_user.`code` = #{code}
</if>
</where>
group by basic_bussiness_type.action
</select>
@ -108,9 +100,6 @@
<if test="action != ''and action != null">
AND basic_bustype_local.action LIKE concat(#{action},'%')
</if>
<if test="enabled != ''and enabled != null">
AND basic_bustype_local.enable =#{enabled}
</if>
<if test="spUse != ''and spUse != null">
AND spUse =#{spUse}
</if>
@ -121,10 +110,9 @@
<insert id="insertBussinessType" keyProperty="id"
parameterType="com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity">
INSERT INTO basic_bustype_local
(action, name, enable, remark, originAction, advanceType, changeEnable, spUse)
(action, name, remark, originAction, advanceType, changeEnable, spUse)
values (#{action},
#{name},
#{enable},
#{remark}, #{originAction}, #{advanceType}, #{changeEnable}, #{spUse})
</insert>
@ -133,7 +121,6 @@
<trim prefix="set" suffixOverrides=",">
<if test="action != null">action = #{action},</if>
<if test="name != null">name = #{name},</if>
<if test="enable != null">enable = #{enable},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="originAction != null">originAction = #{originAction},</if>
<if test="advanceType != null">advanceType = #{advanceType},</if>

@ -15,7 +15,8 @@
basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange,
basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType,
basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder,
basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode
basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne,
basic_bussiness_type.secCheckBalacne
FROM basic_bussiness_type LEFT JOIN basic_bustype_local
on basic_bussiness_type.localAction = basic_bustype_local.action
<where>
@ -90,7 +91,8 @@
basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange,
basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType,
basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder,
basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode
basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne,
basic_bussiness_type.secCheckBalacne
FROM basic_bussiness_type LEFT JOIN basic_bustype_local
on basic_bussiness_type.localAction = basic_bustype_local.action
INNER JOIN inv_warehouse_bussiness_type on basic_bussiness_type.action = inv_warehouse_bussiness_type.action
@ -116,6 +118,7 @@
AND basic_bustype_local.spUse =#{spUse}
</if>
</where>
group by basic_bussiness_type.action
</select>
<insert id="insertBussinessType" keyProperty="id"
@ -126,7 +129,7 @@
checkEnable,genUnit,innerOrder,secCheckEnable,
checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,
secCheckChange,corpType,basic_bussiness_type.storageCode)
secCheckChange,corpType,basic_bussiness_type.storageCode,checkBalacne,secCheckBalacne)
values
(
#{action},
@ -153,7 +156,7 @@
#{secCheckWebNew},
#{secCheckChange},
#{corpType},
#{storageCode}
#{storageCode},#{checkBalacne},#{secCheckBalacne}
)
</insert>
@ -166,7 +169,7 @@
(`index`,action,name,enable,remark,mainAction,localAction,thirdSysFk,
checkEnable,genUnit,innerOrder,secCheckEnable,
checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,corpType,storageCode)
,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,corpType,storageCode,checkBalacne,secCheckBalacne)
values
(
#{index},
@ -194,7 +197,7 @@
#{secCheckWebNew},
#{secCheckChange},
#{corpType},
#{storageCode}
#{storageCode},#{checkBalacne},#{secCheckBalacnesecCheckBalacne}
)
</insert>
@ -224,6 +227,8 @@
<if test="secCheckPc != null">secCheckPc=#{secCheckPc},</if>
<if test="secCheckWebNew != null">secCheckWebNew=#{secCheckWebNew},</if>
<if test="secCheckChange != null">secCheckChange=#{secCheckChange},</if>
<if test="checkBalacne != null">checkBalacne=#{checkBalacne},</if>
<if test="secCheckBalacne != null">secCheckBalacne=#{secCheckBalacne},</if>
<if test="index != null">index=#{index},</if>
<if test="corpType != null">corpType=#{corpType},</if>
<if test="storageCode != null">storageCode=#{storageCode},</if>

@ -36,9 +36,11 @@
basic_products.bhxjcpbm,basic_products.bzcj,basic_products.addType,basic_products.deviceRecordKey,
basic_products.cpmctymc,basic_products.cplb,basic_products.flbm,basic_products.ggxh,basic_products.qxlb,
basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType
basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq
FROM (company_product_relevance
inner JOIN basic_udirel
ON company_product_relevance.udiRlIdFk = basic_udirel.id)
@ -46,7 +48,6 @@
ON basic_udirel.uuid = basic_products.uuid
<where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
@ -95,28 +96,35 @@
<select id="findByUuid" parameterType="java.lang.String"
resultType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">
SELECT * FROM basic_products WHERE (
SELECT *
FROM basic_products
WHERE (
uuid = #{uuid}) limit 1
</select>
<select id="findByUuids" parameterType="java.lang.String"
resultType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">
SELECT * FROM basic_products WHERE (
SELECT *
FROM basic_products
WHERE (
uuid = #{uuid})
</select>
<select id="findByNameCode" parameterType="java.lang.String"
resultType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">
SELECT * FROM basic_products WHERE (
SELECT *
FROM basic_products
WHERE (
nameCode = #{nameCode}) limit 1
</select>
<insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">
replace INTO basic_products
replace
INTO basic_products
(
nameCode,packRatio,packLevel,bhxjsl,
bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
,diType,productType)
,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq)
values
(
#{nameCode},
@ -141,7 +149,12 @@
#{uuid},
#{sjcpbm},
#{versionNumber},
#{diType},#{productType}
#{diType},
#{productType},
#{scbssfbhph},
#{scbssfbhxlh},
#{scbssfbhscrq},
#{scbssfbhsxrq}
)
</insert>
@ -151,7 +164,7 @@
nameCode,packRatio,packLevel,bhxjsl,
bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
,diType,productType
,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq
)
values
@ -180,17 +193,24 @@
#{item.uuid},
#{item.sjcpbm},
#{item.versionNumber},
#{item.diType},#{item.productType}
#{item.diType},#{item.productType}, #{item.scbssfbhph},
#{item.scbssfbhxlh},
#{item.scbssfbhscrq},
#{item.scbssfbhsxrq}
)
</foreach>
</insert>
<delete id="deleteById" parameterType="Map">
DELETE FROM basic_products WHERE id = #{id}
DELETE
FROM basic_products
WHERE id = #{id}
</delete>
<delete id="deleteByUuid" parameterType="Map">
DELETE FROM basic_products WHERE uuid = #{uuid}
DELETE
FROM basic_products
WHERE uuid = #{uuid}
</delete>
<update id="updateUdiInfo" parameterType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">
@ -222,7 +242,10 @@
<if test="measname != null">measname=#{measname},</if>
<if test="diType != null">diType=#{diType},</if>
<if test="productType != null">productType=#{productType},</if>
<if test="scbssfbhph != null">scbssfbhph=#{scbssfbhph},</if>
<if test="scbssfbhxlh != null">scbssfbhxlh=#{scbssfbhxlh},</if>
<if test="scbssfbhscrq != null">scbssfbhscrq=#{scbssfbhscrq},</if>
<if test="scbssfbhsxrq != null">scbssfbhsxrq=#{scbssfbhsxrq},</if>
</trim>
WHERE nameCode = #{nameCode}
</update>
@ -240,7 +263,7 @@
(id, nameCode, packRatio, packLevel, bhxjsl, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, addType,
deviceRecordKey, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh,
ylqxzcrbarywmc, sydycpbs, uuid, sjcpbm, versionNumber, diType, ybbm, sptm, manufactory, measname,
productType) values
productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq) values
<foreach collection="udiInfoEntities" item="item" index="index" separator=",">
(#{item.id},
#{item.nameCode},
@ -271,7 +294,10 @@
#{item.sptm},
#{item.manufactory},
#{item.measname},
#{item.productType})
#{item.productType}, #{item.scbssfbhph},
#{item.scbssfbhxlh},
#{item.scbssfbhscrq},
#{item.scbssfbhsxrq})
</foreach>
</insert>
</mapper>

@ -21,7 +21,10 @@
basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,
basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,
basic_products.diType,basic_products.productType
basic_products.diType,basic_products.productType,basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq
FROM basic_udirel
inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid
@ -47,7 +50,6 @@
<if test="udplatCode != '' and udplatCode != null">
AND basic_udirel.udplatCode = #{udplatCode}
</if>
<if test=" diType != null">
AND basic_products.diType= #{diType}
</if>
@ -96,7 +98,10 @@
basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid,
basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType,
basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence
basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq
FROM basic_products
right JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid
@ -113,6 +118,10 @@
<if test="nameCode != '' and nameCode != null">
AND nameCode LIKE concat(#{nameCode},'%')
</if>
<if test="isDisable == false">
AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false )
</if>
<if test="unionCode != '' and unionCode != null">
and (
nameCode LIKE concat('%',#{unionCode},'%')

@ -42,7 +42,11 @@
basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid,
basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType,
customer_info.companyName, basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence
customer_info.companyName,
basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq
FROM company_product_relevance
inner JOIN basic_udirel
ON company_product_relevance.udiRlIdFk = basic_udirel.id
@ -234,7 +238,8 @@
#{update_time},
#{auditStatus},
#{productUuid},
#{udiRlIdFk},#{unitFk}
#{udiRlIdFk},
#{unitFk}
)
</insert>

@ -83,6 +83,7 @@
,#{item.count}
,#{item.packageLevel} ,#{item.warehouseCode},#{item.nameCode},#{item.supId}
,#{item.relId},#{item.status},#{item.invStorageCode},#{item.invWarehouseCode},#{item.locStorageCode})
</foreach>
</insert>
@ -156,6 +157,7 @@
FROM io_codes
WHERE orderId = #{orderId}
</delete>
<update id="updateCode" parameterType="Map">
UPDATE io_codes
<trim prefix="set" suffixOverrides=",">

@ -211,6 +211,7 @@
</if>
</where>
group by io_order.id
ORDER BY actDate DESC
</select>
@ -281,6 +282,7 @@
and locStorageCode =#{locStorageCode}
</if>
</where>
group by io_order.id
ORDER BY actDate DESC
</select>
@ -351,6 +353,7 @@
and locStorageCode =#{locStorageCode}
</if>
</where>
group by io_order.id
ORDER BY actDate DESC
</select>
@ -414,7 +417,7 @@
and locStorageCode =#{locStorageCode}
</if>
</where>
group by io_order.id
</select>
<select id="findOne" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"

@ -9,6 +9,7 @@
FROM stock_order
INNER JOIN inv_warehouse_user on stock_order.locStorageCode = inv_warehouse_user.`code`
where status = 'success'
group by stock_order.id
</select>
<select id="listStockOrderNoDealWith" parameterType="com.glxp.sale.admin.req.inout.StockOrderQueryRequest"
@ -18,6 +19,7 @@
from stock_order
INNER JOIN inv_warehouse_user on stock_order.locStorageCode = inv_warehouse_user.`code`
where `status` = '101'
group by stock_order.id
ORDER BY id DESC
</select>
@ -171,6 +173,7 @@
and inv_warehouse_user.userId =#{userId}
</if>
</where>
group by stock_order.id
ORDER BY id DESC
</select>
@ -237,7 +240,7 @@
</where>
</select>
<select id="selectSupplementOrderList" resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
select billNo
select *
from stock_order
where supplementNo is null
or supplementNo = ''

@ -154,6 +154,7 @@
GROUP BY #{groupType}
</if>
</select>
<select id="stockStatistics" resultType="com.glxp.sale.admin.res.inventory.InvProductResponse"
parameterType="com.glxp.sale.admin.req.inventory.FilterInvProductRequest">
select bp.cpmctymc,

@ -69,6 +69,7 @@
AND level = #{level}
</if>
</where>
group by inv_warehouse.code
</select>

@ -23,4 +23,21 @@ reviewUser int NULL DEFAULT NULL COMMENT '审核用户ID'
);
alter table basic_products add
(
scbssfbhph VARCHAR(10) NULL DEFAULT NULL COMMENT '是否包含批号',
scbssfbhxlh VARCHAR(10) NULL DEFAULT NULL COMMENT '是否包含序列号',
scbssfbhscrq VARCHAR(10) NULL DEFAULT NULL COMMENT '是否包含生产日期',
scbssfbhsxrq VARCHAR(10) NULL DEFAULT NULL COMMENT '是否包含失效日期'
);
alter table basic_bussiness_type add
(
checkBalacne TINYINT NULL DEFAULT NULL COMMENT '平衡补单是否校验',
secCheckBalacne TINYINT NULL DEFAULT NULL COMMENT '平衡不但是否二次验收'
);

Loading…
Cancel
Save