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

Merge remote-tracking branch 'origin/dev' into test

Browse Source
test
郑明梁 2 years ago
parent 7cdcc7e5bd 85a4d6a26e
commit 98dc99ed2a
23 changed files with 139 additions and 15 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/com/glxp/api/controller/auth/LoginController.java
Unescape Escape View File

@ -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);
}

29
src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java
Unescape Escape View File

@ -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<IoOrderInvoiceResponse> ioOrderInvoiceResponses = ioOrderDetailBizService.selectByorderIdFk(obj.getOrderIdFk());
//组装数据
Map<String, Object> 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<IoOrderInvoiceResponse> ioOrderInvoiceResponses = ioOrderDetailBizService.selectByorderIdFk(ioOrderDetailBizEntity.getOrderIdFk());
//组装数据
Map<String, Object> 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++;
}

37
src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
Unescape Escape View File

@ -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<String> encodeList=new ArrayList<>();
IoOrderInvoiceRequest ioOrderInvoiceRequest=new IoOrderInvoiceRequest();
ioOrderInvoiceRequest.setBindRlFk(ioOrderDetailResultResponse.getBindRlFk() + "");
ioOrderInvoiceRequest.setOrderIdFk(ioOrderDetailResultResponse.getOrderIdFk());
ioOrderInvoiceRequest.setBatchNo(ioOrderDetailResultResponse.getBatchNo());
List<IoOrderInvoiceEntity> 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<String, Object> 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协调调用单据明细
*/

1
src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
Unescape Escape View File

@ -734,7 +734,6 @@ public class SpsSyncDownloadController {
List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
orderInvoiceEntity.setId(IdUtil.getSnowflakeNextId());
orderInvoiceMapper.insert(orderInvoiceEntity);
}
}

1
src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java
Unescape Escape View File

@ -13,6 +13,7 @@ import java.util.List;
public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRelevanceEntity, UdiRelevanceEntity> {
List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest);
String selectPackLevel(@Param("nameCode") String nameCode);
List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest);

2
src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java
Unescape Escape View File

@ -27,6 +27,8 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao,
List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
List<IoOrderInvoiceResponse> selectByorderIdFk(String orderIdFk);
IoOrderInvoiceResponse selectByinvoiceId(Long id);
/**

2
src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java
Unescape Escape View File

@ -34,5 +34,5 @@ public interface ThrProductsDao extends BaseMapperPlus<ThrProductsDao, ThrProduc
List<ThrProductsEntity> selectThrProducts(FilterThrProductsRequest filterThrProductsRequest);
int insertOrUpdateEntity(ThrProductsEntity record);
ThrProductsEntity filterThrProductsByMainId(@Param("relId") String relId);
}

2
src/main/java/com/glxp/api/entity/inv/InnerOrderDetailEntity.java
Unescape Escape View File

@ -13,5 +13,5 @@ public class InnerOrderDetailEntity {
private String productDate;
private String expireDate;
private String batchNo;
private String nameCode;
}

2
src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
Unescape Escape View File

@ -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;

5
src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
Unescape Escape View File

@ -11,7 +11,10 @@ import java.util.List;
*/
@Data
public class FilterOrderDetailResultRequest extends ListPageRequest {
/**
* 供应商ID
*/
private String supId;
/**
* 单据号
*/

2
src/main/java/com/glxp/api/res/inv/innerOrderDetailResponse.java
Unescape Escape View File

@ -6,7 +6,7 @@ import java.math.BigDecimal;
@Data
public class innerOrderDetailResponse {
private String nameCode;
private String id;
private String orderIdFk;
private String productId;

2
src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java
Unescape Escape View File

@ -46,6 +46,8 @@ public interface IoOrderDetailBizService {
List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
List<IoOrderInvoiceResponse> selectByorderIdFk(String orderIdFk);
IoOrderInvoiceResponse selectByinvoiceId(Long id);
Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity);

4
src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java
Unescape Escape View File

@ -46,7 +46,7 @@ public class IoOrderUtilsService {
@Value("${file_path}")
private String filePath;
public boolean getIoder(ioUploadOrderResponse ioUploadOrderRespons) {
public String getIoder(ioUploadOrderResponse ioUploadOrderRespons) {
List<IoOrderDetailCodeEntity> ioOrderDetailCodeEntityList = ioUploadOrderRespons.getIoOrderDetailCodeEntityList();
List<IoCodeEntity> ioCodeEntityList = ioUploadOrderRespons.getIoCodeEntityList();
@ -286,7 +286,7 @@ public class IoOrderUtilsService {
ioCodeTempDao.insertBatch(ioCodeTempEntities);
ioOrderDetailResultDao.insertBatch(ioOrderDetailResultEntities);
ioOrderInvoiceMapper.insertBatch(ioOrderInvoiceEntities);
return true;
return billNO;
}
}

5
src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
Unescape Escape View File

@ -191,6 +191,11 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
return ioOrderDetailBizDao.filterListInv(orderDetailBizRequest);
}
@Override
public List<IoOrderInvoiceResponse> selectByorderIdFk(String orderIdFk) {
return ioOrderDetailBizDao.selectByorderIdFk(orderIdFk);
}
@Override
public IoOrderInvoiceResponse selectByinvoiceId(Long id) {
return ioOrderDetailBizDao.selectByinvoiceId(id);

5
src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java
Unescape Escape View File

@ -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());

1
src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java
Unescape Escape View File

@ -35,5 +35,6 @@ public interface ThrProductsService extends IService<ThrProductsEntity> {
Boolean isExit(String code, String thirdIdFk);
ThrProductsEntity filterThrProductsByMainId(String relId);
}

6
src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
Unescape Escape View File

@ -114,4 +114,10 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
return false;
}
@Override
public ThrProductsEntity filterThrProductsByMainId(String relId) {
return thrProductsDao.filterThrProductsByMainId(relId);
}
}

14
src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -129,6 +129,20 @@
</where>
ORDER BY modifyTime DESC
</select>
<select id="selectPackLevel" parameterType="java.lang.String"
resultType="java.lang.String">
select
basic_products.packLevel
FROM basic_udirel
inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid
<where>
<if test="nameCode != '' and nameCode != null">
AND basic_products.nameCode = #{nameCode}
</if>
</where>
</select>
<select id="filterUdiJoinSup" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"

7
src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
Unescape Escape View File

@ -81,6 +81,13 @@
where id = #{id}
</select>
<select id="selectByorderIdFk" parameterType="java.lang.String"
resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
select *
from io_order_invoice
where orderIdFk = #{orderIdFk}
</select>
<select id="selectOrderDetailBiz" resultType="com.glxp.api.entity.inout.IoOrderDetailBizEntity">
select *
from io_order_detail_biz

3
src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
Unescape Escape View File

@ -36,6 +36,9 @@
<if test="orderIdFk != null and orderIdFk != ''">
AND a2.orderIdFk = #{orderIdFk}
</if>
<if test="supId != null and supId != ''">
AND a2.supId = #{supId}
</if>
<if test="nameCode != null and nameCode != ''">
AND a2.nameCode = #{nameCode}
</if>

5
src/main/resources/mybatis/mapper/inv/InnerOrderDetailDao.xml
Unescape Escape View File

@ -30,7 +30,7 @@
replace
INTO inv_inner_order_detail
(
orderIdFk,productId,productName,`count`,productDate,expireDate,batchNo
orderIdFk,productId,productName,`count`,productDate,expireDate,batchNo,nameCode
)
values (
#{orderIdFk},
@ -39,7 +39,8 @@
#{count},
#{productDate},
#{expireDate},
#{batchNo}
#{batchNo},
#{nameCode}
)
</insert>

13
src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
Unescape Escape View File

@ -344,4 +344,17 @@
updateUser = #{updateUser,jdbcType=VARCHAR},
</trim>
</insert>
<select id="filterThrProductsByMainId" resultType="com.glxp.api.entity.thrsys.ThrProductsEntity">
SELECT *
FROM thr_products
LEFT JOIN basic_udirel ON thr_products.id = basic_udirel.mainId
<where>
<if test="relId != '' and relId != null">
AND basic_udirel.id = #{relId}
</if>
</where>
</select>
</mapper>

2
src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -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);
Write Preview
Loading…
Cancel
Save