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

单据打印排序修改，单据打印数量问题

Browse Source
fengcang
anthonyywj2 3 years ago
parent 08e6b81518
commit 2d734b9650
6 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File

7
api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java
Unescape Escape View File

@ -127,8 +127,10 @@ public class StockOrderDetailController {
StockOrderDetailEntity item = new StockOrderDetailEntity();
BeanUtils.copyProperties(stockOrderDetailEntity, item);
item.setCode(codeDetaiEntity.getCode());
item.setCodeId(codeDetaiEntity.getId().intValue());
item.setSerialNo(codeDetaiEntity.getSerialNo());
item.setCount(codeDetaiEntity.getCount());
item.setReCount(codeDetaiEntity.getCount());
resultList.add(item);
}
@ -138,9 +140,10 @@ public class StockOrderDetailController {
}
}
Collections.sort(resultList, (o1, o2) -> {
Long cp = Long.parseLong(o1.getProductId()) - Long.parseLong(o2.getProductId());
return cp.intValue();
Integer cp = o1.getCodeId() - o2.getCodeId();
return cp;
});
return resultList;
}

45
api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java
Unescape Escape View File

@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.business.StockOrderEntity;
import com.glxp.api.admin.entity.business.StockOrderPrintEntity;
@ -26,6 +27,7 @@ import com.glxp.api.admin.req.itextpdf.StockQRCodeTextPDFTemplateRequest;
import com.glxp.api.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.SystemPDFTemplateRelevanceResponse;
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
import com.glxp.api.admin.service.basic.BussinessLocalTypeService;
import com.glxp.api.admin.service.basic.BussinessTypeService;
import com.glxp.api.admin.service.basic.UdiInfoService;
@ -57,13 +59,11 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
@RestController
public class StockQRCodeTextController {
@Resource
StockOrderService stockOrderService;
@Resource
@ -89,6 +89,8 @@ public class StockQRCodeTextController {
private JaspaperService jaspaperService;
@Resource
private BussinessLocalTypeService bussinessLocalTypeService;
@Resource
private BussinessTypeService bussinessTypeService;
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/qrcode/text/filter")
@ -173,7 +175,6 @@ public class StockQRCodeTextController {
}
}
if (printEntities.size() > 1000) { //如果标签打印数据大于1000，则切割生成多个文件
if (!FileUtils.isFileExist(dirPath + "/pdfprint")) {
new File(dirPath + "/pdfprint").mkdirs();
@ -367,17 +368,17 @@ public class StockQRCodeTextController {
public void stockOrderPDFFromTemplateFile(
@RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest,
HttpServletRequest request, HttpServletResponse response) throws Exception {
StockOrderEntity stockOrderEntity = stockOrderService.findById(stockQRCodeTextPDFTemplateRequest.getId());
SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest();
systemPDFTemplateRelevanceRequest.setModuleId(stockQRCodeTextPDFTemplateRequest.getModuleId());
systemPDFTemplateRelevanceRequest.setLocalAction(stockOrderEntity.getBillType());
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) return;
SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = systemPDFTemplateRelevanceResponses.get(0);
if (bussinessLocalTypeEntity.getOrderVisibleType() == 0) {
/*打印订单*/
List<StockOrderPrintEntity> list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId());
@ -445,9 +446,9 @@ public class StockQRCodeTextController {
if (stockOrderDetailEntity != null) {
stockOrderPrintEntity.setPrice(stockOrderDetailEntity.getPrice());
}
index++;
stockOrderPrintEntity.setCount(stockOrderPrintEntity.getCount() * getActCount(stockOrderPrintEntity));
}
Map<String, Object> data = new HashMap<String, Object>();
@ -461,12 +462,29 @@ public class StockQRCodeTextController {
}
}
@Resource
UdiRelevanceService udiRelevanceService;
public int getActCount(StockOrderPrintEntity stockOrderPrintEntity) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(stockOrderPrintEntity.getRelId());
UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(stockOrderPrintEntity.getNameCode());
if (udiInfoBean != null) {
if ((udiRelevanceEntity.getIsUseDy() != null && udiRelevanceEntity.getIsUseDy()) && udiInfoBean.getDiType() != 2) {
if (udiInfoBean.getBhzxxsbzsl() == 0)
return udiInfoBean.getZxxsbzbhsydysl();
else
return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl();
} else {
return udiInfoBean.getBhzxxsbzsl();
}
}
return 1;
}
public StockOrderDetailEntity getDetailByRelBatch
(List<StockOrderDetailEntity> stockOrderDetailEntities, String relId, String batchNo) {
public StockOrderDetailEntity getDetailByRelBatch(List<StockOrderDetailEntity> stockOrderDetailEntities, String relId, String batchNo) {
for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) {
if (StrUtil.trim(stockOrderDetailEntity.getBatchNo()).equals(StrUtil.trim(batchNo))
&& StrUtil.trim(stockOrderDetailEntity.getRelId()).equals(StrUtil.trim(relId))
if (StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()).equals(StrUtil.trimToEmpty(batchNo))
&& StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId()).equals(StrUtil.trimToEmpty(relId))
) {
return stockOrderDetailEntity;
}
@ -474,6 +492,7 @@ public class StockQRCodeTextController {
return null;
}
@AuthRuleAnnotation("")
@GetMapping(value = "/udiwms/stock/qrcode/text/upload")
public BaseResponse upload(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest,

10
api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java
Unescape Escape View File

@ -493,14 +493,16 @@ public class OrderDetailController {
for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
if (CollUtil.isNotEmpty(codeList)) {
for (WarehouseEntity codeDetaiEntity : codeList) {
if (StrUtil.trimToEmpty(codeDetaiEntity.getRelId()).equals(StrUtil.trimToEmpty(erpOrderEntity.getRelIdFk()))
if (StrUtil.trimToEmpty(codeDetaiEntity.getRelId()).equals(StrUtil.trimToEmpty(erpOrderEntity.getBindRlFk()))
&& StrUtil.trimToEmpty(codeDetaiEntity.getBatchNo()).equals(StrUtil.trimToEmpty(erpOrderEntity.getBatchNo()))
) {
ErpOrderEntity item = new ErpOrderEntity();
BeanUtils.copyProperties(erpOrderEntity, item);
item.setCode(codeDetaiEntity.getCode());
item.setSerialNo(codeDetaiEntity.getSerialNo());
item.setCount(codeDetaiEntity.getCount());
item.setReCount(codeDetaiEntity.getCount());
item.setErpCount(codeDetaiEntity.getCount());
item.setCodeId(codeDetaiEntity.getId().intValue());
resultList.add(item);
}
}
@ -508,8 +510,8 @@ public class OrderDetailController {
}
}
Collections.sort(resultList, (o1, o2) -> {
Long cp = Long.parseLong(o1.getBindRlFk()) - Long.parseLong(o2.getBindRlFk());
return cp.intValue();
Integer cp = o1.getCodeId() - o2.getCodeId();
return cp;
});
return resultList;
}

2
api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java
Unescape Escape View File

@ -40,4 +40,6 @@ public class StockOrderDetailEntity {
private String code;
private String serialNo;
private Integer codeId;
}

5
api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java
Unescape Escape View File

@ -47,4 +47,9 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
private String remark3;
private String manufactory;
private String spmc;
private String cpms;
private String measname; //计量单位
private String udiCode; //条码
private String serialNo; //序列号
private String nameCode;
}

2
api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpOrderEntity.java
Unescape Escape View File

@ -74,5 +74,5 @@ public class ErpOrderEntity {
private String serialNo;
private String code;
private Integer codeId;
}

Write Preview
Loading…
Cancel
Save