diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index 5ed72907..f88b1c13 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -390,8 +390,8 @@ public class LoginController extends BaseController { @PostMapping("/spms/sub/inv/warehouse/addOrder") public BaseResponse addOrder(@RequestBody ioUploadOrderResponse ioUploadOrderRespons) { - ioOrderUtilsService.getIoder(ioUploadOrderRespons); - return ResultVOUtils.success(); + String billNo = ioOrderUtilsService.getIoder(ioUploadOrderRespons); + return ResultVOUtils.success(billNo); } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index ac6661e8..c35664c6 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -20,6 +20,7 @@ import com.glxp.api.req.inout.InspectionPDFTemplateRequest; import com.glxp.api.req.purchase.FilterSupManufacturerRequest; import com.glxp.api.req.purchase.purPlanPrintRequest; import com.glxp.api.req.system.FilterPdfTemplateRequest; +import com.glxp.api.res.inout.IoOrderInvoiceResponse; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import com.glxp.api.service.basic.IBasicBussinessTypeService; @@ -122,6 +123,7 @@ public class BasicOrderPrintController { for (IoOrderDetailBizEntity obj : ioOrderDetailBizEntityList) { //查询产品表 UdiProductEntity udiProductEntity = udiProductService.findByUuid(obj.getUuidFk()); +// List ioOrderInvoiceResponses = ioOrderDetailBizService.selectByorderIdFk(obj.getOrderIdFk()); //组装数据 Map bizData = new HashMap<>(); bizData.put("index", i); @@ -144,6 +146,19 @@ public class BasicOrderPrintController { bizData.put("manufactor", obj.getManufacturer()); bizData.put("zczbhhzbapzbh", obj.getCertCode() == null ? ' ' : obj.getCertCode()); bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); +// bizData.put("cplb", udiProductEntity.getCplb() == null ? ' ' : udiProductEntity.getCplb()); +// if(ioOrderInvoiceResponses != null && ioOrderInvoiceResponses.size()>0){ +// String encode=""; +// for (IoOrderInvoiceResponse respons : ioOrderInvoiceResponses) { +// encode+=respons.getInvoiceEncode()+","; +// } +// encode = encode.substring(0,encode.length()-1); +// bizData.put("invoiceEncode", encode == null ? ' ' : encode); +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// String dateStr = sdf.format(ioOrderInvoiceResponses.get(0).getCreateTime()); +// bizData.put("createTime", dateStr == null ? ' ' : dateStr); +// +// } list.add(bizData); i++; } @@ -170,7 +185,7 @@ public class BasicOrderPrintController { } //查询产品表 UdiProductEntity udiProductEntity = udiProductService.findByUuid(ioOrderDetailBizEntity.getUuidFk()); - +// List ioOrderInvoiceResponses = ioOrderDetailBizService.selectByorderIdFk(ioOrderDetailBizEntity.getOrderIdFk()); //组装数据 Map bizData = new HashMap<>(); bizData.put("index", i); @@ -193,6 +208,18 @@ public class BasicOrderPrintController { bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer()); bizData.put("zczbhhzbapzbh", ioOrderDetailBizEntity.getCertCode() == null ? ' ' : ioOrderDetailBizEntity.getCertCode()); bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); +// bizData.put("cplb", udiProductEntity.getCplb() == null ? ' ' : udiProductEntity.getCplb()); +// if(ioOrderInvoiceResponses != null && ioOrderInvoiceResponses.size()>0){ +// String encode=""; +// for (IoOrderInvoiceResponse respons : ioOrderInvoiceResponses) { +// encode+=respons.getInvoiceEncode()+","; +// } +// encode = encode.substring(0,encode.length()-1); +// bizData.put("invoiceEncode", encode == null ? ' ' : encode); +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// String dateStr = sdf.format(ioOrderInvoiceResponses.get(0).getCreateTime()); +// bizData.put("createTime", dateStr == null ? ' ' : dateStr); +// } list.add(bizData); i++; } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index 8d1b671c..d4742b0b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -11,13 +11,16 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.ConstantType; import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthCompany; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderEntity; +import com.glxp.api.entity.inout.IoOrderInvoiceEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; +import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.req.inout.*; import com.glxp.api.res.inout.CptTraceOrderResponse; import com.glxp.api.res.inout.CptTraceResultResponse; @@ -26,11 +29,14 @@ import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.service.auth.AuthCompanyService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.*; +import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.service.system.SystemPDFModuleService; import com.glxp.api.service.system.SystemPDFTemplateService; +import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.util.DateUtil; import com.glxp.api.util.JasperUtils; import net.sf.jasperreports.engine.JRException; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -66,6 +72,10 @@ public class IoOrderDetailResultController extends BaseController { private String filePath; @Resource AuthCompanyService authCompanyService; + @Resource + private ThrProductsService thrProductsService; + @Resource + private IoOrderInvoiceService ioOrderInvoiceService; /** * 查询单据扫码明细列表 @@ -205,6 +215,7 @@ public class IoOrderDetailResultController extends BaseController { if (filterOrderDetailResultRequest.getList() != null && filterOrderDetailResultRequest.getList().size() > 0) { ioOrderDetailResultResponseList = filterOrderDetailResultRequest.getList(); } else { + //按查询打印 FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); filterOrderRequest.setVueType(filterOrderDetailResultRequest.getActionType()); @@ -226,6 +237,25 @@ public class IoOrderDetailResultController extends BaseController { } int i = 1; for (IoOrderDetailResultResponse ioOrderDetailResultResponse : ioOrderDetailResultResponseList) { + //查询第三方产品产品类别 + ThrProductsEntity thrProductsEntity = thrProductsService.filterThrProductsByMainId(ioOrderDetailResultResponse.getBindRlFk() + ""); + //查询发票信息 + String dateStr=""; + List encodeList=new ArrayList<>(); + IoOrderInvoiceRequest ioOrderInvoiceRequest=new IoOrderInvoiceRequest(); + ioOrderInvoiceRequest.setBindRlFk(ioOrderDetailResultResponse.getBindRlFk() + ""); + ioOrderInvoiceRequest.setOrderIdFk(ioOrderDetailResultResponse.getOrderIdFk()); + ioOrderInvoiceRequest.setBatchNo(ioOrderDetailResultResponse.getBatchNo()); + List ioOrderInvoiceEntityList=ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceRequest); + for (IoOrderInvoiceEntity ioOrderInvoiceEntity : ioOrderInvoiceEntityList) { + encodeList.add(ioOrderInvoiceEntity.getInvoiceEncode()); + } + String encode=String.join(",", encodeList); + if(CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList)){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + dateStr = sdf.format(ioOrderInvoiceEntityList.get(0).getCreateTime()); + } + //组装数据 Map ioOrderDetailResultData = new HashMap<>(); ioOrderDetailResultData.put("index", String.valueOf(i)); @@ -248,11 +278,15 @@ public class IoOrderDetailResultController extends BaseController { ioOrderDetailResultData.put("billTypeName", ioOrderDetailResultResponse.getBillTypeName() == null ? ' ' : ioOrderDetailResultResponse.getBillTypeName()); ioOrderDetailResultData.put("mainAction", ioOrderDetailResultResponse.getMainAction() == null ? ' ' : ioOrderDetailResultResponse.getMainAction()); ioOrderDetailResultData.put("auditTime", ioOrderDetailResultResponse.getAuditTime() == null ? ' ' : formatter.format(ioOrderDetailResultResponse.getAuditTime())); + if(thrProductsEntity!=null){ + ioOrderDetailResultData.put("cplb", thrProductsEntity.getCplb() == null ? ' ' : thrProductsEntity.getCplb()); + } + ioOrderDetailResultData.put("invoiceEncode", encode); + ioOrderDetailResultData.put("createTime", dateStr); list.add(ioOrderDetailResultData); i++; } - data.put("data", list); String param = JSON.toJSONString(data); JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf"); @@ -260,6 +294,7 @@ public class IoOrderDetailResultController extends BaseController { } + /** * 提供UDI协调调用单据明细 */ diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index b438c808..d9ba62af 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -734,7 +734,6 @@ public class SpsSyncDownloadController { List orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities(); for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) { if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) { - orderInvoiceEntity.setId(IdUtil.getSnowflakeNextId()); orderInvoiceMapper.insert(orderInvoiceEntity); } } diff --git a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java index 57627010..2753ae2c 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java @@ -13,6 +13,7 @@ import java.util.List; public interface UdiRelevanceDao extends BaseMapperPlus { List filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest); + String selectPackLevel(@Param("nameCode") String nameCode); List filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest); diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java index c30b546f..a26a90c1 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java @@ -27,6 +27,8 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest); + List selectByorderIdFk(String orderIdFk); + IoOrderInvoiceResponse selectByinvoiceId(Long id); /** diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java index de7235d6..6e345000 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java @@ -34,5 +34,5 @@ public interface ThrProductsDao extends BaseMapperPlus selectThrProducts(FilterThrProductsRequest filterThrProductsRequest); int insertOrUpdateEntity(ThrProductsEntity record); - + ThrProductsEntity filterThrProductsByMainId(@Param("relId") String relId); } diff --git a/src/main/java/com/glxp/api/entity/inv/InnerOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/InnerOrderDetailEntity.java index cd135c6a..7d0d52be 100644 --- a/src/main/java/com/glxp/api/entity/inv/InnerOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InnerOrderDetailEntity.java @@ -13,5 +13,5 @@ public class InnerOrderDetailEntity { private String productDate; private String expireDate; private String batchNo; - + private String nameCode; } diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index 9906b810..0dc9be4f 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -17,7 +17,7 @@ public class FilterUdiRelRequest extends ListPageRequest { private String ggxh; private String thirdId; private Long id; - + private String packLevel; private String thirdId1; private String thirdId2; private String thirdId3; diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java index f27320f3..0540a44b 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java @@ -11,7 +11,10 @@ import java.util.List; */ @Data public class FilterOrderDetailResultRequest extends ListPageRequest { - + /** + * 供应商ID + */ + private String supId; /** * 单据号 */ diff --git a/src/main/java/com/glxp/api/res/inv/innerOrderDetailResponse.java b/src/main/java/com/glxp/api/res/inv/innerOrderDetailResponse.java index 6c02066d..52b3a3e7 100644 --- a/src/main/java/com/glxp/api/res/inv/innerOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/inv/innerOrderDetailResponse.java @@ -6,7 +6,7 @@ import java.math.BigDecimal; @Data public class innerOrderDetailResponse { - + private String nameCode; private String id; private String orderIdFk; private String productId; diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java index 5b0a9ffa..34d77e15 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -46,6 +46,8 @@ public interface IoOrderDetailBizService { List filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest); + List selectByorderIdFk(String orderIdFk); + IoOrderInvoiceResponse selectByinvoiceId(Long id); Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java index a9886529..11bef2f2 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java @@ -46,7 +46,7 @@ public class IoOrderUtilsService { @Value("${file_path}") private String filePath; - public boolean getIoder(ioUploadOrderResponse ioUploadOrderRespons) { + public String getIoder(ioUploadOrderResponse ioUploadOrderRespons) { List ioOrderDetailCodeEntityList = ioUploadOrderRespons.getIoOrderDetailCodeEntityList(); List ioCodeEntityList = ioUploadOrderRespons.getIoCodeEntityList(); @@ -286,7 +286,7 @@ public class IoOrderUtilsService { ioCodeTempDao.insertBatch(ioCodeTempEntities); ioOrderDetailResultDao.insertBatch(ioOrderDetailResultEntities); ioOrderInvoiceMapper.insertBatch(ioOrderInvoiceEntities); - return true; + return billNO; } } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 70ced51f..46a7eb2c 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -191,6 +191,11 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { return ioOrderDetailBizDao.filterListInv(orderDetailBizRequest); } + @Override + public List selectByorderIdFk(String orderIdFk) { + return ioOrderDetailBizDao.selectByorderIdFk(orderIdFk); + } + @Override public IoOrderInvoiceResponse selectByinvoiceId(Long id) { return ioOrderDetailBizDao.selectByinvoiceId(id); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java index f4c4b866..7fc5421d 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java @@ -110,8 +110,11 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService innerOrderPrintEntity.setUpdateUser(customerService.getUserId() + ""); FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); filterUdiRelRequest.setId(Long.valueOf(obj.getProductId())); + filterUdiRelRequest.setPackLevel(udiRelevanceDao.selectPackLevel(obj.getNameCode())); + System.out.println(filterUdiRelRequest.getPackLevel()); //查询耗材字典信息 - UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0); + // UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0); + UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(Integer.parseInt(filterUdiRelRequest.getPackLevel())-1); //查询产品信息 UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode()); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java index 8ba96fbb..98ab868f 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java @@ -35,5 +35,6 @@ public interface ThrProductsService extends IService { Boolean isExit(String code, String thirdIdFk); + ThrProductsEntity filterThrProductsByMainId(String relId); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java index 375002ab..1161cc34 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java @@ -114,4 +114,10 @@ public class ThrProductsServiceImpl extends ServiceImpl ORDER BY modifyTime DESC + + select * + from io_order_invoice + where orderIdFk = #{orderIdFk} + + + SELECT * + FROM thr_products + LEFT JOIN basic_udirel ON thr_products.id = basic_udirel.mainId + + + AND basic_udirel.id = #{relId} + + + + diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 5cdded82..69eadbd0 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -439,3 +439,5 @@ CALL Pro_Temp_ColumnWork('io_order', 'rmInvCode', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode', + 'varchar(255) ', 1); \ No newline at end of file