yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复BUG

Browse Source
product
chuang 2 years ago
parent 215b2001a0
commit 5c901a6199
4 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File

13
SC-boot/linkage-file/src/main/java/jnpf/controller/UtilsController.java
Unescape View File

@ -22,7 +22,6 @@ import jnpf.util.file.UploadUtil;
import jnpf.util.minio.MinioUploadUtil; import jnpf.util.minio.MinioUploadUtil;
import jnpf.utils.YozoUtils; import jnpf.utils.YozoUtils;
import lombok.Cleanup; import lombok.Cleanup;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
@ -37,8 +36,6 @@ import java.nio.channels.FileChannel;
import java.nio.channels.WritableByteChannel; import java.nio.channels.WritableByteChannel;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -157,16 +154,18 @@ public class UtilsController {
if (!StringUtil.isEmpty(fileNameAll)) { if (!StringUtil.isEmpty(fileNameAll)) {
String[] data = fileNameAll.split("#"); String[] data = fileNameAll.split("#");
String token = data.length > 0 ? data[0] : ""; String token = data.length > 0 ? data[0] : "";
// System.out.println("这是个token");
// System.out.println(token);
//验证token //验证token
if (redisUtil.exists(token)) { // if (redisUtil.exists(token)) {
String fileName = data.length > 1 ? data[1] : ""; String fileName = data.length > 1 ? data[1] : "";
String type = data.length > 2 ? data[2] : ""; String type = data.length > 2 ? data[2] : "";
String filePath = FilePathUtil.getFilePath(type.toLowerCase()); String filePath = FilePathUtil.getFilePath(type.toLowerCase());
//下载文件 //下载文件
UploadUtil.downFile(configValueUtil.getFileType(), fileName, type, filePath, name); UploadUtil.downFile(configValueUtil.getFileType(), fileName, type, filePath, name);
} else { // } else {
throw new DataException("token验证失败"); // throw new DataException("token验证失败");
} // }
} }
} }

2
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
Unescape View File

@ -1690,7 +1690,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
// 单位 // 单位
item0.setUnit(model.getUnit()); item0.setUnit(model.getUnit());
//amount金额：price*settlement，保留6位小数 //amount金额：price*settlement，保留6位小数
item0.setAmount(new BigDecimal(model.getSalesPrice())); item0.setAmount(new BigDecimal(model.getPurchasePrice()));
//not_amount不含税金额：price*settlement*(1 - 税率) 不含税价格为sum/1.13=price //not_amount不含税金额：price*settlement*(1 - 税率) 不含税价格为sum/1.13=price
item0.setNotAmount(item0.getAmount().divide(BigDecimal.valueOf(1 + 0.13), RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP)); item0.setNotAmount(item0.getAmount().divide(BigDecimal.valueOf(1 + 0.13), RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
//vehicle_id车辆id：磅单c表车辆id //vehicle_id车辆id：磅单c表车辆id

1
SC-boot/linkage-scm/src/main/resources/mapper/contractMobile/ContractMobileMapper.xml
Unescape View File

@ -457,6 +457,7 @@
AND h.delete_mark = '0' AND h.delete_mark = '0'
LEFT JOIN jg_supplier j ON h.CODE = j.id LEFT JOIN jg_supplier j ON h.CODE = j.id
AND j.delete_mark = '0' AND j.delete_mark = '0'
GROUP BY b.sales_id
) pur ON a.id = pur.id ) pur ON a.id = pur.id
WHERE WHERE
a.delete_mark = '0' a.delete_mark = '0'

26
SC-boot/linkage-scm/src/main/resources/templates/export/paymentDoc.ftl
Unescape View File

@ -164,6 +164,28 @@
</div><!----> </div><!---->
</div> </div>
</li> </li>
<#elseif reportData?is_first >
<li class="el-timeline-item">
<div class="el-timeline-item__tail"></div>
<div
class="el-timeline-item__node el-timeline-item__node--normal el-timeline-item__node--">
<!---->
</div><!---->
<div class="el-timeline-item__wrapper">
<div class="el-timeline-item__timestamp is-top">
${reportData.handleTime!""}
</div>
<div class="el-timeline-item__content">
<div class="el-card box-card is-always-shadow"><!---->
<div class="el-card__body">
<div class="text item">
发起人：${reportData.realName!""}
</div>
</div>
</div>
</div><!---->
</div>
</li>
<#else > <#else >
<li class="el-timeline-item"> <li class="el-timeline-item">
<div class="el-timeline-item__tail"></div> <div class="el-timeline-item__tail"></div>
@ -195,10 +217,6 @@
</div> </div>
</li> </li>
</#if> </#if>
</#if> </#if>

Write Preview
Loading…
Cancel
Save