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

Merge remote-tracking branch 'origin/fencang' into fencang

Browse Source
fencang
anthonyywj2 3 years ago
parent 74f153f7e8 dd290f5f7e
commit 1ce70a97ce
5 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File

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

@ -27,7 +27,6 @@ import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.info.CompanyService;
import com.glxp.sale.admin.service.inout.*;
import com.glxp.sale.admin.service.inventory.InvStockPrintService;
import com.glxp.sale.admin.service.inventory.InvWarehouseService;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.util.*;
import com.glxp.sale.common.enums.ResultEnum;
@ -65,7 +64,6 @@ public class StockOrderController {
private UdiRelevanceService udiRelevanceService;
@Resource
private SystemParamConfigService systemParamConfigService;
@Resource
private AuthAdminService authAdminService;
@Resource
@ -81,10 +79,6 @@ public class StockOrderController {
@Resource
CustomerService customerService;
@Resource
InvWarehouseService invWarehouseService;
@Resource
WarehouseUserService warehouseUserService;
@Resource
GennerOrderUtils gennerOrderUtils;
@Resource
private BussinessTypeService bussinessTypeService;
@ -272,7 +266,6 @@ public class StockOrderController {
if (StringUtils.isNotBlank(stockOrderFilterRequest.getCorpId())) {
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderFilterRequest.getCorpId()));
if (companyEntity.getUnitIdFk().equals("110")) {
Integer userId = customerService.getUserId();
stockOrderFilterRequest.setUnitIdFk(null);
stockOrderFilterRequest.setUserId(customerService.getUserId());
} else {

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

@ -28,7 +28,6 @@ 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;
@ -72,7 +71,6 @@ public class StockOrderDetailController {
private UdiRelevanceService udiRelevanceService;
@Resource
private CompanyProductRelevanceService companyProductRelevanceService;
@Autowired
private SystemParamConfigService systemParamConfigService;
@Resource
@ -81,8 +79,6 @@ public class StockOrderDetailController {
BussinessLocalTypeService bussinessLocalTypeService;
@Resource
CodesService codesService;
@Resource
BussinessTypeService bussinessTypeService;
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/filter")
@ -94,8 +90,6 @@ public class StockOrderDetailController {
}
StockOrderEntity stockOrderEntity = stockOrderService.findById(stockOrderDetailFilterRequest.getOrderIdFk());
stockOrderDetailFilterRequest.setPage(null);
stockOrderDetailFilterRequest.setLimit(null);
List<StockOrderDetailEntity> stockOrderDetailEntityList
= stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
@ -494,6 +488,7 @@ public class StockOrderDetailController {
companyProductRelevanceRequest.setIsDisable(false);
List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
PageInfo<UdiRelevanceResponse> pageInfo2 = null;
if (filterUdiInfoRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
BussinessLocalTypeEntity bussinessTypeEntity = bussinessLocalTypeService.findBTByAction(filterUdiInfoRequest.getBillType());
@ -502,7 +497,17 @@ public class StockOrderDetailController {
companyProductRelevanceRequest.setUnitFk(companyProductRelevanceRequest.getCorpId());
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
} else {
basicInstrumentMaintainRelevanceResponses = getHosDatas(filterUdiInfoRequest);
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
pageInfo2 = new PageInfo<>(udiRelevanceResponses);
if (!pageInfo2.getList().isEmpty()) {
basicInstrumentMaintainRelevanceResponses = new ArrayList<>(pageInfo2.getList().size());
for (UdiRelevanceResponse udiRelevanceResponse : pageInfo2.getList()) {
CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse();
BeanUtils.copyProperties(udiRelevanceResponse, companyProductRelevanceResponse);
companyProductRelevanceResponse.setRlId(udiRelevanceResponse.getId());
basicInstrumentMaintainRelevanceResponses.add(companyProductRelevanceResponse);
}
}
}
} else {
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
@ -512,23 +517,15 @@ public class StockOrderDetailController {
PageInfo<CompanyProductRelevanceResponse> pageInfo;
pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
PageSimpleResponse<CompanyProductRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
if (null != pageInfo2) {
pageSimpleResponse.setTotal(pageInfo2.getTotal());
} else {
pageSimpleResponse.setTotal(pageInfo.getTotal());
}
pageSimpleResponse.setList(basicInstrumentMaintainRelevanceResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
public List<CompanyProductRelevanceResponse> getHosDatas(FilterUdiInfoRequest filterUdiInfoRequest) {
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = new ArrayList<>();
for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse();
BeanUtils.copyProperties(udiRelevanceResponse, companyProductRelevanceResponse);
companyProductRelevanceResponse.setRlId(udiRelevanceResponse.getId());
basicInstrumentMaintainRelevanceResponses.add(companyProductRelevanceResponse);
}
return basicInstrumentMaintainRelevanceResponses;
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/copy")
public BaseResponse uploadCount(@RequestParam("id") String id) {

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

@ -25,6 +25,7 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
private String customerId;
private BigDecimal totalPrice;
private String locInv;
private String subInv;
public BigDecimal getPrice() {
// if (price == null)

4
api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java
Unescape Escape View File

@ -8,7 +8,6 @@ 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 com.glxp.sale.admin.service.basic.BasicThirdSysService;
import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import org.springframework.stereotype.Service;
@ -120,8 +119,7 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit());
}
List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiGp(filterUdiInfoRequest);
return data;
return udiRelevanceDao.filterUdiGp(filterUdiInfoRequest);
}
@Override

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

@ -303,11 +303,12 @@
select io_codes.code udiCode,basic_udirel.id productId,basic_products.cpmctymc productName,basic_products.ggxh
spec,io_codes.batchNo,io_codes.produceDate productDate,io_codes.expireDate ,io_codes.serialNo,io_codes.count,
basic_products.ylqxzcrbarmc,basic_udirel.manufactory,basic_udirel.measname,basic_products.zczbhhzbapzbh,
inv_warehouse.name locInv,basic_products.spmc, basic_products.cpms,io_codes.nameCode,io_codes.relId
inv_warehouse.name locInv, inv_warehouse_sub.name subInv, basic_products.spmc, basic_products.cpms,io_codes.nameCode,io_codes.relId
from io_codes
INNER JOIN basic_udirel on io_codes.relId = basic_udirel.id
INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid
LEFT JOIN inv_warehouse ON io_codes.locStorageCode = inv_warehouse.`code`
left join inv_warehouse_sub on io_codes.invWarehouseCode = inv_warehouse_sub.code
<where>
<if test="orderId != '' and orderId !=null">
and io_codes.orderId =#{orderId}

Write Preview
Loading…
Cancel
Save