r
/
hangtag
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: r:c13bf4b47a2bc4396727d53c7116c8420b8d07de
Branches Tags
r:main
r:dev
..
compare: r:94fafa8cab75b75d2110238f11df53f28da847db
Branches Tags
r:dev
r:main

No commits in common. "c13bf4b47a2bc4396727d53c7116c8420b8d07de" and "94fafa8cab75b75d2110238f11df53f28da847db" have entirely different histories.
c13bf4b47a ... 94fafa8cab

2 changed files with 4 additions and 7 deletions
Show Stats Expand all files Collapse all files

8
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
View File

@ -473,10 +473,8 @@ public class SaleOrderServiceImpl implements SaleOrderService {
saveReqVO.setProduceDate(LocalDateTime.now());
saveReqVO.setInspectionDate(LocalDateTime.now());
saveReqVO.setDeliverydate(LocalDateTime.now());
if(saleOrderSkuDO!=null&&saleOrderSkuDO.size()>0 && "尺码唛".equals(productInfo.getProductTypeName())){
SaleOrderSkuDO skuDo = saleOrderSkuDO.get(0);
String remarks = skuDo.getOrderQty() + " " + skuDo.getLabelSize();
saveReqVO.setRemarks(remarks);
if(saleOrderSkuDO!=null&&saleOrderSkuDO.size()>0){
saveReqVO.setRemarks(saleOrderSkuDO.get(0).getRemark());
}
Double specSizeWidth = productInfo.getSpecSizeWidth();
Double specSizeHeight = productInfo.getSpecSizeHeight();
@ -1015,7 +1013,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
String billno = getNewOrderCode2();
String contractType = saleOrder.getContractType();
if (StringUtils.isNotBlank(contractType)) {
billno = billno.replace("XXXX", contractType);
billno = billno.replace("XXXX-", contractType + "-");
}
/* // 优先使用销售订单合同号
String billno = saleOrder.getContractCode();

3
hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue
View File

@ -302,7 +302,7 @@ const resetForm = () => {
formRef.value?.resetFields()
}
// 下载
const downpdf = async () => {
const id = formData.value.id;
if (id) {
@ -345,7 +345,6 @@ const downpdf = async () => {
}
// 预览
const preview = async () => {
const id = formData.value.id;
if (id) {