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

切换分支代码备份

Browse Source
feature-order-fix
anthonyywj2 3 years ago
parent 7aff6d4b46
commit 3b8e7b1972
13 changed files with 273 additions and 280 deletions
Show Stats Download Patch File Download Diff File

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

@ -49,7 +49,6 @@ public class BussinessChangeTypeController {
} }
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(bussinessLocalTypeEntity.getAction()); BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(bussinessLocalTypeEntity.getAction());
bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction()); bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
if (bussinessTypeEntities == null || bussinessTypeEntities.size() == 0) { if (bussinessTypeEntities == null || bussinessTypeEntities.size() == 0) {
//创建对应流转单据 //创建对应流转单据
if (bussinessTypeFilterRequest.getType() != null if (bussinessTypeFilterRequest.getType() != null
@ -57,34 +56,17 @@ public class BussinessChangeTypeController {
) { ) {
if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) { if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) {
BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity(); BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity();
bussinessChangeTypeEntity1.setIntro("出库自动补\"供应商入库单\"");
bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_IN); bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_IN);
bussinessChangeTypeEntity1.setIndex(1); bussinessChangeTypeEntity1.setIndex(1);
bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction()); bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction());
bussinessChangeTypeEntity1.setBeforeTime(1); bussinessChangeTypeEntity1.setBeforeTime(1);
bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1); bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1);
BussinessChangeTypeEntity bussinessChangeTypeEntity2 = new BussinessChangeTypeEntity();
bussinessChangeTypeEntity2.setIntro("出库自动补\"调拨入库单\"");
bussinessChangeTypeEntity2.setChangeType(ConstantStatus.ORDER_CHANGE_INNOR_NORMAL_IN);
bussinessChangeTypeEntity2.setIndex(1);
bussinessChangeTypeEntity2.setAction(bussinessTypeFilterRequest.getAction());
bussinessChangeTypeEntity1.setBeforeTime(1);
bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity2);
BussinessChangeTypeEntity bussinessChangeTypeEntity3 = new BussinessChangeTypeEntity();
bussinessChangeTypeEntity3.setIntro("出库自动补\"寄售转入单\"");
bussinessChangeTypeEntity3.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_ADV_IN);
bussinessChangeTypeEntity3.setIndex(2);
bussinessChangeTypeEntity3.setAction(bussinessTypeFilterRequest.getAction());
bussinessChangeTypeEntity1.setBeforeTime(1);
bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity3);
bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
} else if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && bussinessTypeEntity.isAdvanceType()) { } else if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && bussinessTypeEntity.isAdvanceType()) {
BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity(); BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity();
bussinessChangeTypeEntity1.setIntro("出库自动补\"寄售入库单\"");
bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_ADVANCE_IN); bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_ADVANCE_IN);
bussinessChangeTypeEntity1.setIndex(1); bussinessChangeTypeEntity1.setIndex(1);
bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction());
bussinessChangeTypeEntity1.setBeforeTime(1); bussinessChangeTypeEntity1.setBeforeTime(1);
bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction());
bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1); bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1);
bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction()); bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
} }

44
api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java
Unescape Escape View File

@ -45,6 +45,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -171,10 +172,15 @@ public class UdiRelevanceController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
List<UdiRelevanceResponse> udiRelevanceResponses = null; List<UdiRelevanceResponse> udiRelevanceResponses = null;
filterUdiInfoRequest.setDiType(1); if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUnionCode())) {
if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().isEmpty()) { filterUdiInfoRequest.setNameCode(filterUdiInfoRequest.getUnionCode());
UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode()); List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
filterUdiInfoRequest.setNameCode(udiEntity.getUdi()); if (temps != null && temps.size() > 0) {
filterUdiInfoRequest.setUuid(temps.get(0).getUuid());
filterUdiInfoRequest.setNameCode(null);
}
} else {
filterUdiInfoRequest.setDiType(1);
} }
udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
@ -286,15 +292,43 @@ public class UdiRelevanceController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udi/udirel/update") @PostMapping("/udi/udirel/update")
public BaseResponse updateRelevanceEntity(@RequestBody UdiRelevanceEntity udiRelevanceEntity, BindingResult bindingResult) { public BaseResponse updateRelevanceEntity(@RequestBody UdiRelevanceResponse udiRelevanceResponse, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
BeanUtils.copyProperties(udiRelevanceResponse, udiRelevanceEntity);
udiRelevanceEntity.setId(udiRelevanceResponse.getId() + "");
String time = DateUtil.getDateTime(); String time = DateUtil.getDateTime();
udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setModifyTime(time);
if (udiRelevanceResponse.getIsUseDy() == 1) {
udiRelevanceEntity.setIsUseDy(true);
} else udiRelevanceEntity.setIsUseDy(false);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
udiInfoEntity.setSptm(udiRelevanceResponse.getSptm());
udiInfoEntity.setYbbm(udiRelevanceResponse.getYbbm());
udiInfoEntity.setMeasname(udiRelevanceResponse.getMeasname());
udiInfoEntity.setManufactory(udiRelevanceResponse.getManufactory());
udiInfoEntity.setCpms(udiRelevanceResponse.getCpms());
udiInfoEntity.setPrice(udiRelevanceResponse.getPrice());
udiInfoEntity.setSpmc(udiRelevanceResponse.getSpmc());
udiInfoEntity.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1());
udiInfoEntity.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2());
udiInfoEntity.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3());
udiInfoEntity.setBasicPrductRemak4(udiRelevanceResponse.getBasicPrductRemak4());
udiInfoEntity.setBasicPrductRemak5(udiRelevanceResponse.getBasicPrductRemak5());
udiInfoEntity.setBasicPrductRemak6(udiRelevanceResponse.getBasicPrductRemak6());
udiInfoEntity.setBasicPrductRemak7(udiRelevanceResponse.getBasicPrductRemak7());
udiInfoEntity.setBasicPrductRemak8(udiRelevanceResponse.getBasicPrductRemak8());
udiInfoEntity.setUuid(udiRelevanceResponse.getUuid());
udiInfoService.updateUdiInfo(udiInfoEntity);
return ResultVOUtils.success("更新成功"); return ResultVOUtils.success("更新成功");
} }

6
api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java
Unescape Escape View File

@ -70,13 +70,13 @@ public class CompanyProductRelevanceController {
List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
if (temps != null && temps.size() > 0) { if (temps != null && temps.size() > 0) {
companyProductRelevanceRequest.setUuid(temps.get(0).getUuid()); companyProductRelevanceRequest.setUuid(temps.get(0).getUuid());
companyProductRelevanceRequest.setNameCode(null); companyProductRelevanceRequest.setNameCode(filterUdiInfoRequest.getNameCode());
companyProductRelevanceRequest.setUnionCode(null); companyProductRelevanceRequest.setUnionCode(null);
} }
} else {
companyProductRelevanceRequest.setDiType(1);
} }
List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null; List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
companyProductRelevanceRequest.setDiType(1);
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest); basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
PageInfo<CompanyProductRelevanceResponse> pageInfo; PageInfo<CompanyProductRelevanceResponse> pageInfo;
pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses); pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);

3
api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDao.java
Unescape Escape View File

@ -8,6 +8,7 @@ import com.glxp.api.admin.req.business.StockOrderUploadRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List; import java.util.List;
@Mapper @Mapper
@ -25,7 +26,7 @@ public interface StockOrderDao {
boolean deleteById(@Param("id") String id); boolean deleteById(@Param("id") String id);
boolean updateByStatus(@Param("orderId") String orderId, @Param("status") Integer status); boolean updateByStatus(@Param("orderId") String orderId, @Param("status") Integer status, @Param("updateTime") Date updateTime);
List<StockOrderEntity> filterListOr(StockOrderFilterRequest stockOrderFilterRequest); List<StockOrderEntity> filterListOr(StockOrderFilterRequest stockOrderFilterRequest);

4
api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java
Unescape Escape View File

@ -67,6 +67,10 @@ public class UdiRelevanceEntity {
//产品描述 //产品描述
private String cpms; private String cpms;
private Boolean useMuti; //是否多次使用
private Integer useNum; //最小包装单元可使用次数
public Integer getLockStatus() { public Integer getLockStatus() {
if (lockStatus == null) if (lockStatus == null)
return 1; return 1;

2
api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java
Unescape Escape View File

@ -87,6 +87,8 @@ public class UdiRelevanceResponse {
private String basicPrductRemak7; private String basicPrductRemak7;
private String basicPrductRemak8; private String basicPrductRemak8;
private Integer rlId; private Integer rlId;
private Boolean useMuti; //是否多次使用
private Integer useNum; //最小包装单元可使用次数
public int getBhzxxsbzsl() { public int getBhzxxsbzsl() {

5
api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.admin.service.basic.impl; package com.glxp.api.admin.service.basic.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.basic.UdiInfoDao; import com.glxp.api.admin.dao.basic.UdiInfoDao;
import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity;
@ -25,7 +26,7 @@ public class UdiInfoServiceImpl implements UdiInfoService {
if (filterUdiInfoRequest == null) { if (filterUdiInfoRequest == null) {
return Collections.emptyList(); return Collections.emptyList();
} }
if(filterUdiInfoRequest.getPage()!=null){ if (filterUdiInfoRequest.getPage() != null) {
int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit(); int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit();
PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit()); PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit());
} }
@ -102,6 +103,8 @@ public class UdiInfoServiceImpl implements UdiInfoService {
@Override @Override
public boolean updateUdiInfo(UdiInfoEntity udiInfoEntity) { public boolean updateUdiInfo(UdiInfoEntity udiInfoEntity) {
if (StrUtil.isEmpty(udiInfoEntity.getUuid()))
return false;
return udiInfoDao.updateUdiInfo(udiInfoEntity); return udiInfoDao.updateUdiInfo(udiInfoEntity);
} }

5
api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java
Unescape Escape View File

@ -107,6 +107,7 @@ public class StockOrderServiceImpl implements StockOrderService {
@Override @Override
public boolean insertStockOrder(StockOrderEntity stockOrderEntity) { public boolean insertStockOrder(StockOrderEntity stockOrderEntity) {
stockOrderEntity.setUpdateTime(new Date());
return stockOrderDao.insertStockOrder(stockOrderEntity); return stockOrderDao.insertStockOrder(stockOrderEntity);
} }
@ -122,6 +123,7 @@ public class StockOrderServiceImpl implements StockOrderService {
@Override @Override
public boolean updateById(StockOrderEntity stockOrderEntity) { public boolean updateById(StockOrderEntity stockOrderEntity) {
stockOrderEntity.setUpdateTime(new Date());
return stockOrderDao.updateById(stockOrderEntity); return stockOrderDao.updateById(stockOrderEntity);
} }
@ -137,7 +139,8 @@ public class StockOrderServiceImpl implements StockOrderService {
@Override @Override
public boolean updateByStatus(String orderId, Integer status) { public boolean updateByStatus(String orderId, Integer status) {
return stockOrderDao.updateByStatus(orderId, status); return stockOrderDao.updateByStatus(orderId, status, new Date());
} }
@Override @Override

69
api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java
Unescape Escape View File

@ -95,31 +95,11 @@ public class InvProductsTrService {
if (bussinessTypeEntity.isPreIn()) { if (bussinessTypeEntity.isPreIn()) {
InvProductEntity invPreProductEntity = null; InvProductEntity invPreProductEntity = null;
// invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), warehouseEntity.getSupId()
// , warehouseEntity.getLocStorageCode(), warehouseEntity.getInvWarehouseCode());
if (invPreProductEntity == null) { if (invPreProductEntity == null) {
invPreProductEntity = buildInvPreInProduct(orderEntity, erpOrderEntity, warehouseEntity); invPreProductEntity = buildInvPreInProduct(orderEntity, erpOrderEntity, warehouseEntity);
invPreProductEntity.setUpdateTime(new Date()); invPreProductEntity.setUpdateTime(new Date());
invPreInProductService.insertInvProduct(invPreProductEntity); invPreInProductService.insertInvProduct(invPreProductEntity);
} }
/**
* else {
* int actCount = getActCount(warehouseEntity);
* int count = actCount * warehouseEntity.getCount();
* if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
* invPreProductEntity.setOutCount(invPreProductEntity.getOutCount() + count);
* } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
* invPreProductEntity.setInCount(invPreProductEntity.getInCount() + count);
* }
* if (erpOrderEntity.getPrice() != null) {
* invPreProductEntity.setPrice(erpOrderEntity.getPrice() + "");
* }
* invPreProductEntity.setUpdateTime(new Date());
* invPreInProductService.updateInvProduct(invPreProductEntity);
* }
*/
} else if (bussinessTypeEntity.isAdvanceType()) {//预入库，则转存预入库 } else if (bussinessTypeEntity.isAdvanceType()) {//预入库，则转存预入库
InvProductEntity invPreProductEntity = InvProductEntity invPreProductEntity =
invPreProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), warehouseEntity.getSupId() invPreProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), warehouseEntity.getSupId()
@ -166,10 +146,13 @@ public class InvProductsTrService {
} }
if (orderEntity.isPreCheck()) { if (orderEntity.isPreCheck()) {
//暂时不需要去计算库存
// int actCount = getActCount(warehouseEntity); // int actCount = getActCount(warehouseEntity);
// int count = actCount * warehouseEntity.getCount(); // int count = actCount * warehouseEntity.getCount();
// InvProductEntity preInvEntity = invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), // InvProductEntity preInvEntity = invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(),
// warehouseEntity.getSupId(), null, null); // warehouseEntity.getSupId(), null, null);
//
// if (preInvEntity != null) { // if (preInvEntity != null) {
// if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { // if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
// preInvEntity.setOutCount(preInvEntity.getOutCount() + count); // preInvEntity.setOutCount(preInvEntity.getOutCount() + count);
@ -177,9 +160,10 @@ public class InvProductsTrService {
// if (erpOrderEntity.getPrice() != null) { // if (erpOrderEntity.getPrice() != null) {
// preInvEntity.setPrice(erpOrderEntity.getPrice() + ""); // preInvEntity.setPrice(erpOrderEntity.getPrice() + "");
// } // }
// preInvEntity.setUpdateTime(new Date());
// invPreInProductService.updateInvProduct(preInvEntity);
// } // }
// preInvEntity.setUpdateTime(new Date());
// invPreInProductService.updateInvProduct(preInvEntity);
} }
} }
@ -205,12 +189,6 @@ public class InvProductsTrService {
invProductDetailEntities = buildInvProductDetail(orderId, erpOrderEntity, orderEntity, 3); invProductDetailEntities = buildInvProductDetail(orderId, erpOrderEntity, orderEntity, 3);
} else { } else {
invProductDetailEntities = buildInvProductDetail(orderId, erpOrderEntity, orderEntity, 2); invProductDetailEntities = buildInvProductDetail(orderId, erpOrderEntity, orderEntity, 2);
// if (orderEntity.isPreCheck()) {
//// insetInv(bussinessTypeEntity, invProductDetailEntities);//2.插入当前库存
//
// invPreInProductDetailService.insertInvProducts(invProductDetailEntities);
// }
} }
if (invProductDetailEntities != null && invProductDetailEntities.size() > 0) { if (invProductDetailEntities != null && invProductDetailEntities.size() > 0) {
mInvProductDetailEntities.addAll(invProductDetailEntities); mInvProductDetailEntities.addAll(invProductDetailEntities);
@ -222,7 +200,6 @@ public class InvProductsTrService {
//单据流转 //单据流转
List<BussinessChangeTypeEntity> bussinessChangeTypeEntitys = bussinessChangeTypeService.findByAction(bussinessLocalTypeEntity.getLocalAction()); List<BussinessChangeTypeEntity> bussinessChangeTypeEntitys = bussinessChangeTypeService.findByAction(bussinessLocalTypeEntity.getLocalAction());
if ((bussinessChangeTypeEntitys != null && bussinessChangeTypeEntitys.size() > 0) && bussinessLocalTypeEntity.isChangeEnable()) { if ((bussinessChangeTypeEntitys != null && bussinessChangeTypeEntitys.size() > 0) && bussinessLocalTypeEntity.isChangeEnable()) {
if (orderEntity.isOutChangeEnable()) {//是否缺量补单 if (orderEntity.isOutChangeEnable()) {//是否缺量补单
//普通出库 //普通出库
if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) { if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) {
@ -256,26 +233,12 @@ public class InvProductsTrService {
//普通出库补单-- //补采购入库，调拨入库，寄售转入 //普通出库补单-- //补采购入库，调拨入库，寄售转入
public void addUseOutOrder(OrderEntity orderEntity, List<InvProductDetailEntity> invProductDetailEntities, List<BussinessChangeTypeEntity> bussinessChangeTypeEntities) { public void addUseOutOrder(OrderEntity orderEntity, List<InvProductDetailEntity> invProductDetailEntities, List<BussinessChangeTypeEntity> bussinessChangeTypeEntities) {
BussinessChangeTypeEntity bussinessChangeTypeEntity = bussinessChangeTypeEntity = bussinessChangeTypeEntities.get(0);
BussinessChangeTypeEntity advChangeTypeEntity = null;
BussinessChangeTypeEntity norChangeTypeEntity = null;
BussinessChangeTypeEntity outChangeTypeEntity = null;
BussinessChangeTypeEntity innorChangeTypeEntity = null;
for (BussinessChangeTypeEntity bussinessChangeTypeEntity : bussinessChangeTypeEntities) {
if (bussinessChangeTypeEntity.getChangeType() == ConstantStatus.ORDER_CHANGE_NORMAL_ADV_IN) {
advChangeTypeEntity = bussinessChangeTypeEntity;
} else if (bussinessChangeTypeEntity.getChangeType() == ConstantStatus.ORDER_CHANGE_NORMAL_IN) {
outChangeTypeEntity = bussinessChangeTypeEntity;
} else if (bussinessChangeTypeEntity.getChangeType() == ConstantStatus.ORDER_CHANGE_INNOR_NORMAL_IN) {
innorChangeTypeEntity = bussinessChangeTypeEntity;
}
}
List<WarehouseEntity> warehouseEntities = codesService.findByReceiptId(orderEntity.getId()); List<WarehouseEntity> warehouseEntities = codesService.findByReceiptId(orderEntity.getId());
List<WarehouseEntity> inList = new ArrayList<>(); List<WarehouseEntity> inList = new ArrayList<>();
List<WarehouseEntity> preiInList = new ArrayList<>(); List<WarehouseEntity> preiInList = new ArrayList<>();
//缺量补单时是否全量补单 //缺量补单时是否全量补单
BussinessTypeEntity bussinessTypeEntity1 = bussinessTypeService.findBTByAction(orderEntity.getAction()); BussinessTypeEntity bussinessTypeEntity1 = bussinessTypeService.findBTByAction(orderEntity.getAction());
// SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("ullage_supplement_all");
if (bussinessTypeEntity1.isSupplementAll()) { if (bussinessTypeEntity1.isSupplementAll()) {
insetInv(bussinessTypeEntity1, invProductDetailEntities);//2.插入当前库存 insetInv(bussinessTypeEntity1, invProductDetailEntities);//2.插入当前库存
WarehouseEntity warehouseEntity = warehouseEntities.get(0); WarehouseEntity warehouseEntity = warehouseEntities.get(0);
@ -286,7 +249,6 @@ public class InvProductsTrService {
} }
} else { } else {
if (locWarehouseEntity.getLevel() > 1) { if (locWarehouseEntity.getLevel() > 1) {
norChangeTypeEntity = innorChangeTypeEntity;
InvWarehouseEntity pInWarehouseEntity = invWarehouseService.selectByCode(locWarehouseEntity.getPcode()); InvWarehouseEntity pInWarehouseEntity = invWarehouseService.selectByCode(locWarehouseEntity.getPcode());
for (WarehouseEntity tempEntity : warehouseEntities) { for (WarehouseEntity tempEntity : warehouseEntities) {
tempEntity.setFromCorp(pInWarehouseEntity.getName()); tempEntity.setFromCorp(pInWarehouseEntity.getName());
@ -294,7 +256,6 @@ public class InvProductsTrService {
inList.add(tempEntity); inList.add(tempEntity);
} }
} else { } else {
norChangeTypeEntity = outChangeTypeEntity;
BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(warehouseEntity.getSupId()); BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(warehouseEntity.getSupId());
for (WarehouseEntity tempEntity : warehouseEntities) { for (WarehouseEntity tempEntity : warehouseEntities) {
tempEntity.setFromCorpId(warehouseEntity.getSupId()); tempEntity.setFromCorpId(warehouseEntity.getSupId());
@ -325,7 +286,7 @@ public class InvProductsTrService {
* 《寄售转入库》往来单位： * 《寄售转入库》往来单位：
* 单据类型的当前仓库（如果当前仓库有设置，则判断该当前仓库是否为1级库并且仓库类型=寄售，如果没设置，那么往来单位自动为默认寄售仓库），当前仓库：出库单据的当前仓库 * 单据类型的当前仓库（如果当前仓库有设置，则判断该当前仓库是否为1级库并且仓库类型=寄售，如果没设置，那么往来单位自动为默认寄售仓库），当前仓库：出库单据的当前仓库
*/ */
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(advChangeTypeEntity.getScAction()); BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(bussinessChangeTypeEntity.getScAction());
InvWarehouseEntity invWarehouseEntity; InvWarehouseEntity invWarehouseEntity;
if (!StrUtil.isEmpty(bussinessTypeEntity.getStorageCode())) { if (!StrUtil.isEmpty(bussinessTypeEntity.getStorageCode())) {
invWarehouseEntity = invWarehouseService.selectByCode(bussinessTypeEntity.getStorageCode()); invWarehouseEntity = invWarehouseService.selectByCode(bussinessTypeEntity.getStorageCode());
@ -337,13 +298,11 @@ public class InvProductsTrService {
} else } else
invWarehouseEntity = invWarehouseService.findDefault(true, true); invWarehouseEntity = invWarehouseService.findDefault(true, true);
int invCount = getCountByOrder(null, warehouseEntity); int invCount = getCountByOrder(null, warehouseEntity);
warehouseEntity.setFromCorpId(invWarehouseEntity.getCode()); warehouseEntity.setFromCorpId(invWarehouseEntity.getCode());
warehouseEntity.setFromCorp(invWarehouseEntity.getName()); warehouseEntity.setFromCorp(invWarehouseEntity.getName());
if (invCount > 0) {//仓库已存在该产品 if (invCount > 0) {//仓库已存在该产品
if (count > invCount) { //当前数量>结余数量，说明该产品是无序列号或者是多级包装 if (count > invCount) { //当前数量>结余数量，说明该产品是无序列号或者是多级包装
// UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode());
if (actCount > invCount) { //该产品实际数量大于结余数量，说明是多级包装，直接补 if (actCount > invCount) { //该产品实际数量大于结余数量，说明是多级包装，直接补
preiInList.add(warehouseEntity); preiInList.add(warehouseEntity);
} else if (warehouseEntity.getSerialNo() == null) { //无序列号（多级包装无序列号的已在上一步被排除），补齐数量 } else if (warehouseEntity.getSerialNo() == null) { //无序列号（多级包装无序列号的已在上一步被排除），补齐数量
@ -373,7 +332,6 @@ public class InvProductsTrService {
warehouseEntity.setFromCorpId(pInWarehouseEntity.getCode()); warehouseEntity.setFromCorpId(pInWarehouseEntity.getCode());
invCount = getCountByOrder(null, warehouseEntity); invCount = getCountByOrder(null, warehouseEntity);
norChangeTypeEntity = innorChangeTypeEntity;
} else { //补供应商入库 } else { //补供应商入库
/** /**
* 供应商入库》往来单位：根据产品指定的供应商，当前仓库：出库单据的当前仓库； * 供应商入库》往来单位：根据产品指定的供应商，当前仓库：出库单据的当前仓库；
@ -383,7 +341,6 @@ public class InvProductsTrService {
BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(warehouseEntity.getSupId()); BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(warehouseEntity.getSupId());
warehouseEntity.setFromCorp(basicUnitMaintainEntity.getName()); warehouseEntity.setFromCorp(basicUnitMaintainEntity.getName());
invCount = getCountByOrder(null, warehouseEntity); invCount = getCountByOrder(null, warehouseEntity);
norChangeTypeEntity = outChangeTypeEntity;
} }
if (invCount > 0) {//仓库已存在该产品 if (invCount > 0) {//仓库已存在该产品
@ -411,12 +368,12 @@ public class InvProductsTrService {
if (inList.size() > 0) { if (inList.size() > 0) {
List<WarehouseEntity> temps = filterMapCodes(inList); List<WarehouseEntity> temps = filterMapCodes(inList);
buildInOrder(norChangeTypeEntity, temps, orderEntity); //3.生成采购入库流转单据 buildInOrder(bussinessChangeTypeEntity, temps, orderEntity); //3.生成采购入库流转单据
} }
if (preiInList.size() > 0) { if (preiInList.size() > 0) {
List<WarehouseEntity> temps1 = filterMapCodes(preiInList); List<WarehouseEntity> temps1 = filterMapCodes(preiInList);
buildNorPreInOrder(advChangeTypeEntity, temps1, orderEntity); //3.补寄售转入 buildNorPreInOrder(bussinessChangeTypeEntity, temps1, orderEntity); //3.补寄售转入
} }
} }
@ -646,7 +603,6 @@ public class InvProductsTrService {
outOrder.setFromCorpId(null); outOrder.setFromCorpId(null);
outOrder.setLocStorageCode(orderEntity.getLocStorageCode()); outOrder.setLocStorageCode(orderEntity.getLocStorageCode());
outOrder.setInvStorageCode(orderEntity.getInvStorageCode()); outOrder.setInvStorageCode(orderEntity.getInvStorageCode());
//互填单号 //互填单号
orderEntity.setUllageSupNo(outOrder.getId()); orderEntity.setUllageSupNo(outOrder.getId());
orderEntity.setUpdateTime(new Date()); orderEntity.setUpdateTime(new Date());
@ -712,15 +668,13 @@ public class InvProductsTrService {
outOrder.setId(orderNo); outOrder.setId(orderNo);
outOrder.setFromCorpId(corpName); outOrder.setFromCorpId(corpName);
outOrder.setFromCorp(temps.get(0).getFromCorp()); outOrder.setFromCorp(temps.get(0).getFromCorp());
// BussinessTypeEntity originBT = bussinessTypeService.findBTByAction(orderEntity.getAction()); // BussinessTypeEntity originBT = bussinessTypeService.findBTByAction(orderEntity.getAction());
if (StrUtil.isNotEmpty(bussinessChangeTypeEntity.getDefaultSubInv())) { if (StrUtil.isNotEmpty(bussinessChangeTypeEntity.getDefaultSubInv())) {
outOrder.setFromSubInvCode(bussinessChangeTypeEntity.getDefaultSubInv()); outOrder.setFromSubInvCode(bussinessChangeTypeEntity.getDefaultSubInv());
} }
outOrder.setCorpOrderId(CustomUtil.getId() + "x"); outOrder.setCorpOrderId(CustomUtil.getId() + "x");
outOrder.setLocStorageCode(orderEntity.getLocStorageCode()); outOrder.setLocStorageCode(orderEntity.getLocStorageCode());
outOrder.setInvStorageCode(orderEntity.getInvStorageCode()); outOrder.setInvStorageCode(orderEntity.getLocStorageCode());
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit"); SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit");
if ("1".equals(systemParamConfigEntity.getParamValue())) { if ("1".equals(systemParamConfigEntity.getParamValue())) {
@ -963,6 +917,7 @@ public class InvProductsTrService {
} }
} }
public void insetInvSingle(boolean isPre, InvProductDetailEntity invProductDetailEntity) { public void insetInvSingle(boolean isPre, InvProductDetailEntity invProductDetailEntity) {
List<InvProductDetailEntity> invProductDetailEntities = new ArrayList<>(); List<InvProductDetailEntity> invProductDetailEntities = new ArrayList<>();
invProductDetailEntities.add(invProductDetailEntity); invProductDetailEntities.add(invProductDetailEntity);

2
api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
Unescape Escape View File

@ -279,7 +279,7 @@
<if test="basicPrductRemak8 != null">basicPrductRemak8=#{basicPrductRemak8},</if> <if test="basicPrductRemak8 != null">basicPrductRemak8=#{basicPrductRemak8},</if>
</trim> </trim>
WHERE nameCode = #{nameCode} WHERE uuid = #{uuid}
</update> </update>
<update id="updateUdiInfoByUuid" parameterType="com.glxp.api.admin.entity.basic.UdiInfoEntity"> <update id="updateUdiInfoByUuid" parameterType="com.glxp.api.admin.entity.basic.UdiInfoEntity">

387
api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -30,10 +30,10 @@
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid
,basic_products.basicPrductRemak1 ,basic_products.basicPrductRemak1
,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6 ,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6
,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8 ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8, basic_udirel.useNum, basic_udirel.useMuti
FROM basic_udirel FROM basic_udirel
inner JOIN basic_products inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid ON basic_products.uuid = basic_udirel.uuid
<where> <where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null"> <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
@ -97,83 +97,83 @@
<select id="filterUdiJoinSup" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest" <select id="filterUdiJoinSup" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.api.admin.res.basic.UdiRelevanceResponse"> resultType="com.glxp.api.admin.res.basic.UdiRelevanceResponse">
select basic_udirel.id, select basic_udirel.id,
basic_udirel.thirdId, basic_udirel.thirdId,
basic_udirel.thirdName, basic_udirel.thirdName,
basic_udirel.isUseDy, basic_udirel.isUseDy,
basic_udirel.thirdId1, basic_udirel.thirdId1,
basic_udirel.thirdId2, basic_udirel.thirdId2,
basic_udirel.thirdId3, basic_udirel.thirdId3,
basic_udirel.thirdId4, basic_udirel.thirdId4,
basic_udirel.thirdName1, basic_udirel.thirdName1,
basic_udirel.thirdName2, basic_udirel.thirdName2,
basic_udirel.thirdName3, basic_udirel.thirdName3,
basic_udirel.thirdName4, basic_udirel.thirdName4,
basic_udirel.manufactory, basic_udirel.manufactory,
basic_udirel.measname, basic_udirel.measname,
basic_udirel.ybbm, basic_udirel.ybbm,
basic_udirel.sptm, basic_udirel.sptm,
basic_udirel.price, basic_udirel.price,
basic_udirel.isDisable, basic_udirel.isDisable,
basic_udirel.isLock, basic_udirel.isLock,
basic_udirel.lockStatus, basic_udirel.lockStatus,
basic_udirel.udplatCode, basic_udirel.udplatCode,
basic_udirel.isAdavence, basic_udirel.isAdavence,
basic_udirel.mainId, basic_udirel.mainId,
basic_products.allowNoBatch, basic_products.allowNoBatch,
basic_products.allowNoExpire, basic_products.allowNoExpire,
basic_products.allowNoProduct, basic_products.allowNoProduct,
basic_products.nameCode, basic_products.nameCode,
basic_products.packRatio, basic_products.packRatio,
basic_products.packLevel, basic_products.packLevel,
basic_products.bhxjsl, basic_products.bhxjsl,
basic_products.bhzxxsbzsl, basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl, basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm, basic_products.bhxjcpbm,
basic_products.bzcj, basic_products.bzcj,
basic_products.addType, basic_products.addType,
basic_products.deviceRecordKey, basic_products.deviceRecordKey,
basic_products.cpmctymc, basic_products.cpmctymc,
basic_products.cplb, basic_products.cplb,
basic_products.flbm, basic_products.flbm,
basic_products.ggxh, basic_products.ggxh,
basic_products.qxlb, basic_products.qxlb,
basic_products.tyshxydm, basic_products.tyshxydm,
basic_products.ylqxzcrbarmc, basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh, basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc, basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs, basic_products.sydycpbs,
basic_products.uuid, basic_products.uuid,
basic_products.sjcpbm, basic_products.sjcpbm,
basic_products.versionNumber, basic_products.versionNumber,
basic_products.diType, basic_products.diType,
basic_products.productType, basic_products.productType,
basic_products.scbssfbhph, basic_products.scbssfbhph,
basic_products.scbssfbhxlh, basic_products.scbssfbhxlh,
basic_products.cpdls, basic_products.cpdls,
basic_products.scbssfbhscrq, basic_products.scbssfbhscrq,
basic_corp.name companyName, basic_corp.name companyName,
basic_products.scbssfbhsxrq, basic_products.scbssfbhsxrq,
basic_products.cpms, basic_products.cpms,
basic_udirel.supName, basic_udirel.supName,
company_product_relevance.unitFk, company_product_relevance.unitFk,
basic_products.originUuid basic_products.originUuid
, ,
basic_products.basicPrductRemak1 basic_products.basicPrductRemak1
, ,
basic_products.basicPrductRemak2, basic_products.basicPrductRemak2,
basic_products.basicPrductRemak3, basic_products.basicPrductRemak3,
basic_products.basicPrductRemak4, basic_products.basicPrductRemak4,
basic_products.basicPrductRemak5, basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6 basic_products.basicPrductRemak6
, ,
basic_products.basicPrductRemak7, basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8 basic_products.basicPrductRemak8, basic_udirel.useNum, basic_udirel.useMuti
FROM basic_udirel FROM basic_udirel
inner JOIN basic_products inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid ON basic_products.uuid = basic_udirel.uuid
left join company_product_relevance left join company_product_relevance
on basic_udirel.id = company_product_relevance.udiRlIdFk on basic_udirel.id = company_product_relevance.udiRlIdFk
left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
<where> <where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null"> <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
@ -240,78 +240,78 @@
<select id="filterUdiGp" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest" <select id="filterUdiGp" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.api.admin.res.basic.UdiRelevanceResponse"> resultType="com.glxp.api.admin.res.basic.UdiRelevanceResponse">
select basic_udirel.id, select basic_udirel.id,
basic_udirel.thirdId, basic_udirel.thirdId,
basic_udirel.thirdName, basic_udirel.thirdName,
basic_udirel.isUseDy, basic_udirel.isUseDy,
basic_udirel.thirdId1, basic_udirel.thirdId1,
basic_udirel.thirdId2, basic_udirel.thirdId2,
basic_udirel.thirdId3, basic_udirel.thirdId3,
basic_udirel.thirdId4, basic_udirel.thirdId4,
basic_udirel.ybbm, basic_udirel.ybbm,
basic_udirel.sptm, basic_udirel.sptm,
basic_udirel.isDisable, basic_udirel.isDisable,
basic_udirel.isLock, basic_udirel.isLock,
basic_udirel.lockStatus, basic_udirel.lockStatus,
basic_udirel.thirdName1, basic_udirel.thirdName1,
basic_udirel.thirdName2, basic_udirel.thirdName2,
basic_udirel.thirdName3, basic_udirel.thirdName3,
basic_udirel.thirdName4, basic_udirel.thirdName4,
basic_udirel.manufactory, basic_udirel.manufactory,
basic_udirel.measname, basic_udirel.measname,
basic_udirel.udplatCode, basic_udirel.udplatCode,
basic_products.allowNoBatch, basic_products.allowNoBatch,
basic_products.allowNoExpire, basic_products.allowNoExpire,
basic_products.allowNoProduct, basic_products.allowNoProduct,
basic_udirel.price, basic_udirel.price,
basic_products.nameCode, basic_products.nameCode,
basic_products.packRatio, basic_products.packRatio,
basic_products.packLevel, basic_products.packLevel,
basic_products.bhxjsl, basic_products.bhxjsl,
basic_products.bhzxxsbzsl, basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl, basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm, basic_products.bhxjcpbm,
basic_products.bzcj, basic_products.bzcj,
basic_products.addType, basic_products.addType,
basic_products.deviceRecordKey, basic_products.deviceRecordKey,
basic_products.cpmctymc, basic_products.cpmctymc,
basic_products.cplb, basic_products.cplb,
basic_products.flbm, basic_products.flbm,
basic_products.ggxh, basic_products.ggxh,
basic_products.qxlb, basic_products.qxlb,
basic_products.tyshxydm, basic_products.tyshxydm,
basic_products.ylqxzcrbarmc, basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh, basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc, basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs, basic_products.sydycpbs,
basic_products.uuid, basic_products.uuid,
basic_products.sjcpbm, basic_products.sjcpbm,
basic_products.versionNumber, basic_products.versionNumber,
basic_products.diType, basic_products.diType,
basic_udirel.mainId, basic_udirel.mainId,
basic_udirel.mainName, basic_udirel.mainName,
basic_udirel.isAdavence, basic_udirel.isAdavence,
basic_products.scbssfbhph, basic_products.scbssfbhph,
basic_products.scbssfbhxlh, basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq, basic_products.scbssfbhscrq,
basic_products.cpdls, basic_products.cpdls,
basic_products.scbssfbhsxrq, basic_products.scbssfbhsxrq,
basic_products.cpms, basic_products.cpms,
basic_udirel.supName, basic_udirel.supName,
basic_products.originUuid, basic_products.originUuid,
basic_products.spmc, basic_products.spmc,
basic_products.basicPrductRemak1 basic_products.basicPrductRemak1
, ,
basic_products.basicPrductRemak2, basic_products.basicPrductRemak2,
basic_products.basicPrductRemak3, basic_products.basicPrductRemak3,
basic_products.basicPrductRemak4, basic_products.basicPrductRemak4,
basic_products.basicPrductRemak5, basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6 basic_products.basicPrductRemak6
, ,
basic_products.basicPrductRemak7, basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8 basic_products.basicPrductRemak8,basic_udirel.useNum, basic_udirel.useMuti
FROM basic_products FROM basic_products
right JOIN basic_udirel right JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid ON basic_products.uuid = basic_udirel.uuid
<where> <where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null"> <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
@ -334,16 +334,16 @@
<if test="unionCode != '' and unionCode != null"> <if test="unionCode != '' and unionCode != null">
and ( and (
nameCode LIKE concat('%', #{unionCode}, '%') nameCode LIKE concat('%', #{unionCode}, '%')
or basic_udirel.ybbm LIKE concat('%', #{unionCode}, '%') or basic_udirel.ybbm LIKE concat('%', #{unionCode}, '%')
or basic_udirel.sptm LIKE concat('%', #{unionCode}, '%')) or basic_udirel.sptm LIKE concat('%', #{unionCode}, '%'))
</if> </if>
<if test="thrPiId != '' and thrPiId != null"> <if test="thrPiId != '' and thrPiId != null">
and (thirdId LIKE concat('%', #{thrPiId}, '%') and (thirdId LIKE concat('%', #{thrPiId}, '%')
or thirdId1 LIKE concat('%', #{thrPiId}, '%') or thirdId1 LIKE concat('%', #{thrPiId}, '%')
or thirdId2 LIKE concat('%', #{thrPiId}, '%') or thirdId2 LIKE concat('%', #{thrPiId}, '%')
or thirdId3 LIKE concat('%', #{thrPiId}, '%') or thirdId3 LIKE concat('%', #{thrPiId}, '%')
or thirdId4 LIKE concat('%', #{thrPiId}, '%')) or thirdId4 LIKE concat('%', #{thrPiId}, '%'))
</if> </if>
<if test="uuid != '' and uuid != null"> <if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid} AND basic_udirel.uuid = #{uuid}
@ -362,7 +362,7 @@
</if> </if>
<if test="filterType != null and filterType == 1"> <if test="filterType != null and filterType == 1">
AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '') thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
and basic_products.originUuid <![CDATA[<>]]> '' and basic_products.originUuid <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 2"> <if test="filterType != null and filterType == 2">
@ -423,7 +423,7 @@
resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity"> resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity">
select * select *
from basic_udirel from basic_udirel
INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid
<where> <where>
<if test="uuid != '' and uuid != null"> <if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid} AND basic_udirel.uuid = #{uuid}
@ -545,11 +545,11 @@
<insert id="insertUdiRelevance" keyProperty="id" parameterType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity"> <insert id="insertUdiRelevance" keyProperty="id" parameterType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity">
replace replace
INTO basic_udirel INTO basic_udirel
(id, (id,
thirdId,thirdName,uuid,isUseDy,updateTime,modifyTime, thirdId,thirdName,uuid,isUseDy,updateTime,modifyTime,
thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price ,useNum,useMuti
) )
values values
( (
@ -579,19 +579,22 @@
#{lockStatus}, #{lockStatus},
#{udplatCode}, #{udplatCode},
#{isAdavence}, #{isAdavence},
#{supName},#{price} #{supName},
#{price},
#{useNum},
#{useMuti}
) )
</insert> </insert>
<insert id="insertUdiRelevanceignore" keyProperty="id" <insert id="insertUdiRelevanceignore" keyProperty="id"
parameterType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity"> parameterType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity">
insert insert
ignore ignore
INTO basic_udirel INTO basic_udirel
(id, (id,
thirdId,thirdName,uuid,isUseDy,updateTime,modifyTime, thirdId,thirdName,uuid,isUseDy,updateTime,modifyTime,
thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price,modifyTime ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price,modifyTime,useNum,useMuti
) )
values values
( (
@ -622,7 +625,10 @@
#{udplatCode}, #{udplatCode},
#{isAdavence}, #{isAdavence},
#{supName}, #{supName},
#{price},#{modifyTime} #{price},
#{modifyTime},
#{useNum},
#{useMuti}
) )
</insert> </insert>
@ -728,6 +734,8 @@
<if test="price != null"> <if test="price != null">
price=#{price}, price=#{price},
</if> </if>
<if test="useNum != null">useNum=#{useNum},</if>
<if test="useMuti != null">useMuti=#{useMuti}</if>
</trim> </trim>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
@ -748,34 +756,35 @@
</select> </select>
<insert id="importUdiRelevance" parameterType="java.util.List"> <insert id="importUdiRelevance" parameterType="java.util.List">
replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, modifyTime, thirdId1, thirdId2, thirdId3, replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, modifyTime, thirdId1, thirdId2,
thirdId3,
thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory, thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory,
measname, isDisable, mainId, mainName, udplatCode,supName,price,modifyTime) measname, isDisable, mainId, mainName, udplatCode,supName,price,modifyTime,useNum,useMuti)
values values
<foreach collection="udiRelevanceEntities" item="item" index="index" separator=","> <foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
(#{item.id}, (#{item.id},
#{item.thirdId}, #{item.thirdId},
#{item.thirdName}, #{item.thirdName},
#{item.uuid}, #{item.uuid},
#{item.isUseDy}, #{item.isUseDy},
#{item.updateTime}, #{item.updateTime},
#{item.modifyTime}, #{item.modifyTime},
#{item.thirdId1}, #{item.thirdId1},
#{item.thirdId2}, #{item.thirdId2},
#{item.thirdId3}, #{item.thirdId3},
#{item.thirdId4}, #{item.thirdId4},
#{item.thirdName1}, #{item.thirdName1},
#{item.thirdName2}, #{item.thirdName2},
#{item.thirdName3}, #{item.thirdName3},
#{item.thirdName4}, #{item.thirdName4},
#{item.ybbm}, #{item.ybbm},
#{item.sptm}, #{item.sptm},
#{item.manufactory}, #{item.manufactory},
#{item.measname}, #{item.measname},
#{item.isDisable}, #{item.isDisable},
#{item.mainId}, #{item.mainId},
#{item.mainName}, #{item.mainName},
#{item.udplatCode}, #{item.supName}, #{item.price}, #{modifyTime}) #{item.udplatCode}, #{item.supName}, #{item.price}, #{modifyTime},#{item.useNum},#{item.useMuti})
</foreach> </foreach>
</insert> </insert>
</mapper> </mapper>

4
api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
Unescape Escape View File

@ -95,7 +95,7 @@
<update id="updateByStatus" parameterType="Map"> <update id="updateByStatus" parameterType="Map">
UPDATE stock_order UPDATE stock_order
SET `status` = #{status} SET `status` = #{status},`updateTime` = #{updateTime}
where id = #{orderId} where id = #{orderId}
</update> </update>
<update id="updateSupplementNoByBillNo"> <update id="updateSupplementNoByBillNo">
@ -218,7 +218,7 @@
</if> </if>
</where> </where>
group by stock_order.id group by stock_order.id
ORDER BY id DESC ORDER BY updateTime DESC
</select> </select>

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

@ -6,7 +6,7 @@
<select id="findCompany" <select id="findCompany"
resultType="com.glxp.api.admin.entity.info.CompanyEntity"> resultType="com.glxp.api.admin.entity.info.CompanyEntity">
SELECT * FROM auth_company SELECT * FROM auth_company limit 1
</select> </select>
<update id="modifyCompany" parameterType="com.glxp.api.admin.entity.info.CompanyEntity"> <update id="modifyCompany" parameterType="com.glxp.api.admin.entity.info.CompanyEntity">

Write Preview
Loading…
Cancel
Save