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

代码备份，业务单据提交，价格。等

Browse Source
fencang
anthonyywj2 3 years ago
parent 95acd3c49e
commit 012e1b866c
8 changed files with 72 additions and 37 deletions
Show Stats Download Patch File Download Diff File

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

@ -217,18 +217,13 @@ public class UdiInfoController {
public BaseResponse filterLocalByUuid(FilterUdiInfoRequest productInfoFilterRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(productInfoFilterRequest.getRelId());
udiRelevanceService.selectByUuid(productInfoFilterRequest.getUuid());
List<UdiInfoEntity> udiInfoEntities = udiInfoService.filterAllUdiInfo(productInfoFilterRequest);
if (CollUtil.isNotEmpty(udiInfoEntities)) {
for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
if (udiRelevanceEntity != null) {
udiInfoEntity.setManufactory(udiRelevanceEntity.getManufactory());
udiInfoEntity.setMeasname(udiRelevanceEntity.getMeasname());
udiInfoEntity.setPrice(udiRelevanceEntity.getPrice());
}
}
}

81
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java
Unescape Escape View File

@ -9,6 +9,8 @@ import com.glxp.sale.admin.entity.auth.AuthAdmin;
import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity;
import com.glxp.sale.admin.entity.inout.StockOrderEntity;
import com.glxp.sale.admin.entity.inout.WarehouseEntity;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.entity.udid.UdiEntity;
import com.glxp.sale.admin.exception.JsonException;
@ -26,15 +28,14 @@ import com.glxp.sale.admin.res.inout.StockOrderDetailQueryProductResponse;
import com.glxp.sale.admin.res.inout.StockOrderDetailResponse;
import com.glxp.sale.admin.service.auth.AuthAdminService;
import com.glxp.sale.admin.service.basic.BussinessLocalTypeService;
import com.glxp.sale.admin.service.basic.BussinessTypeService;
import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
import com.glxp.sale.admin.service.inout.CodesService;
import com.glxp.sale.admin.service.inout.StockOrderDetailService;
import com.glxp.sale.admin.service.inout.StockOrderDetailTempService;
import com.glxp.sale.admin.service.inout.StockQRCodeTextService;
import com.glxp.sale.admin.service.inout.StockOrderService;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.thread.IoTransInoutService;
import com.glxp.sale.admin.util.Constant;
import com.glxp.sale.admin.util.FilterUdiUtils;
import com.glxp.sale.common.enums.ResultEnum;
@ -52,6 +53,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@RestController
@ -60,9 +62,9 @@ public class StockOrderDetailController {
@Resource
StockOrderDetailService stockOrderDetailService;
@Resource
StockOrderDetailTempService stockOrderDetailTempService;
StockOrderService stockOrderService;
@Resource
StockQRCodeTextService stockQRCodeTextService;
StockOrderDetailTempService stockOrderDetailTempService;
@Resource
UdiInfoService udiInfoService;
@Resource
@ -70,16 +72,15 @@ public class StockOrderDetailController {
@Resource
private CompanyProductRelevanceService companyProductRelevanceService;
@Resource
private IoTransInoutService transInoutService;
@Autowired
private SystemParamConfigService systemParamConfigService;
@Resource
AuthAdminService authAdminService;
@Resource
BussinessTypeService bussinessTypeService;
@Resource
BussinessLocalTypeService bussinessLocalTypeService;
@Resource
CodesService codesService;
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/filter")
@ -89,21 +90,15 @@ public class StockOrderDetailController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
StockOrderEntity stockOrderEntity = stockOrderService.findById(stockOrderDetailFilterRequest.getOrderIdFk());
String value = systemParamConfigService.selectValueByParamKey("oeder_detail_by_code");
List<StockOrderDetailEntity> stockOrderDetailEntityList
= stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
// if (CollUtil.isNotEmpty(stockOrderDetailEntityList)) {
//
// for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) {
// UdiRelevanceResponse udiInfoEntity = udiRelevanceService.selectGroupById(stockOrderDetailEntity.getProductId());
// stockOrderDetailEntity.setAllowNoBatch(udiInfoEntity.isAllowNoBatch());
// stockOrderDetailEntity.setAllowNoBatch(udiInfoEntity.isAllowNoBatch());
// stockOrderDetailEntity.setAllowNoBatch(udiInfoEntity.isAllowNoBatch());
// }
//
// if (StrUtil.isNotEmpty(value) && value.equals("1")) {
// stockOrderDetailEntityList = transferSerList(stockOrderDetailEntityList, stockOrderEntity.getOrderIdFk());
// }
PageInfo<StockOrderDetailEntity> pageInfo;
pageInfo = new PageInfo<>(stockOrderDetailEntityList);
PageSimpleResponse<StockOrderDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
@ -112,6 +107,36 @@ public class StockOrderDetailController {
return ResultVOUtils.success(pageSimpleResponse);
}
public List<StockOrderDetailEntity> transferSerList(List<StockOrderDetailEntity> stockOrderDetailEntities, String orderId) {
List<StockOrderDetailEntity> resultList = new ArrayList<>();
List<WarehouseEntity> codeList = codesService.findByReceiptId(orderId);
if (CollUtil.isNotEmpty(stockOrderDetailEntities)) {
for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) {
if (CollUtil.isNotEmpty(codeList)) {
for (WarehouseEntity codeDetaiEntity : codeList) {
if (StrUtil.trimToEmpty(codeDetaiEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId()))
&& StrUtil.trimToEmpty(codeDetaiEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()))
) {
StockOrderDetailEntity item = new StockOrderDetailEntity();
BeanUtils.copyProperties(stockOrderDetailEntity, item);
item.setCode(codeDetaiEntity.getCode());
item.setSerialNo(codeDetaiEntity.getSerialNo());
item.setCount(codeDetaiEntity.getCount() + "");
resultList.add(item);
}
}
}
}
}
Collections.sort(resultList, (o1, o2) -> {
Long cp = Long.parseLong(o1.getProductId()) - Long.parseLong(o2.getProductId());
return cp.intValue();
});
return resultList;
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/filter2")
public BaseResponse filterStockOrderDetail2(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
@ -458,17 +483,13 @@ public class StockOrderDetailController {
BeanUtils.copyProperties(filterUdiInfoRequest, companyProductRelevanceRequest);
companyProductRelevanceRequest.setIsDisable(false);
List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
if (filterUdiInfoRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
BussinessLocalTypeEntity bussinessTypeEntity = bussinessLocalTypeService.findBTByAction(filterUdiInfoRequest.getBillType());
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
companyProductRelevanceRequest.setCustomerId(null);
companyProductRelevanceRequest.setUnitFk(companyProductRelevanceRequest.getCorpId());
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
} else {
basicInstrumentMaintainRelevanceResponses = getHosDatas(filterUdiInfoRequest);
}
} else {
BussinessLocalTypeEntity bussinessTypeEntity = bussinessLocalTypeService.findBTByAction(filterUdiInfoRequest.getBillType());
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
companyProductRelevanceRequest.setCustomerId(null);
companyProductRelevanceRequest.setUnitFk(companyProductRelevanceRequest.getCorpId());
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
} else {
basicInstrumentMaintainRelevanceResponses = getHosDatas(filterUdiInfoRequest);
}
PageInfo<CompanyProductRelevanceResponse> pageInfo;
pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);

3
api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsDao.java
Unescape Escape View File

@ -16,8 +16,11 @@ public interface ThrProductsDao {
List<ThrProductsEntity> batchSelectByIds(FilterThrProductsRequest filterThrProductsRequest);
ThrProductsEntity selectById(@Param("id") String id);
List<ThrProductsEntity> selectThrProducts(FilterThrProductsRequest filterThrProductsRequest);
boolean insertOrUpdateSelective(ThrProductsEntity thrProductsEntity);
boolean insertThrProducts(ThrProductsEntity thrProductsEntity);
boolean insertThrProductss(@Param("thrProductsEntities") List<ThrProductsEntity> thrProductsEntities);

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

@ -65,6 +65,8 @@ public class UdiInfoEntity {
private boolean allowNoExpire;
private boolean allowNoProduct;
private String price;
public Integer getId() {
return id;
}

3
api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderDetailEntity.java
Unescape Escape View File

@ -38,5 +38,6 @@ public class StockOrderDetailEntity {
private boolean allowNoBatch;
private boolean allowNoExpire;
private boolean allowNoProduct;
private String code;
private String serialNo;
}

2
api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsService.java
Unescape Escape View File

@ -16,6 +16,8 @@ public interface ThrProductsService {
ThrProductsEntity selectById(String id);
boolean insertOrUpdateSelective(ThrProductsEntity thrProductsEntity);
boolean insertThrProducts(ThrProductsEntity thrProductsEntity);
boolean insertThrProductss(List<ThrProductsEntity> thrProductsEntities);

5
api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsServiceImpl.java
Unescape Escape View File

@ -54,6 +54,11 @@ public class ThrProductsServiceImpl implements ThrProductsService {
return thrProductsDao.selectById(id);
}
@Override
public boolean insertOrUpdateSelective(ThrProductsEntity thrProductsEntity) {
return thrProductsDao.insertOrUpdateSelective(thrProductsEntity);
}
@Override
public boolean insertThrProducts(ThrProductsEntity thrProductsEntity) {
return thrProductsDao.insertThrProducts(thrProductsEntity);

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

@ -40,6 +40,7 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -868,6 +869,11 @@ public class IoTransInoutService {
stockOrderDetailEntity.setBatchNo(erpOrderEntity.getBatchNo());
stockOrderDetailEntity.setProductDate(erpOrderEntity.getProductDate());
stockOrderDetailEntity.setExpireDate(erpOrderEntity.getExpireDate());
if (erpOrderEntity.getPrice() == null) {
if (StrUtil.isNotEmpty(udiRelevanceEntity.getPrice())) {
stockOrderDetailEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice()));
}
}
// stockOrderDetailEntity.setYlqxzcrbarmc(erpOrderEntity.get());
if (erpOrderEntity.getCount() != null) {
stockOrderDetailEntity.setSweepCount(erpOrderEntity.getCount() + "");

Write Preview
Loading…
Cancel
Save