Browse Source

获取客户编码 改为从视图获取 sxm 2021-12-7

master
[li_she] 4 years ago
parent
commit
7cce847995
  1. 3
      src/main/java/com/gaotao/modules/finishedProduct/service/impl/SoReceiveBoxesServiceImpl.java
  2. 4
      src/main/resources/mapper/finishedProduct/PackingDao.xml
  3. 4
      src/main/resources/static/pda/js/productwarehouse/storage.js

3
src/main/java/com/gaotao/modules/finishedProduct/service/impl/SoReceiveBoxesServiceImpl.java

@ -110,7 +110,7 @@ public class SoReceiveBoxesServiceImpl extends ServiceImpl<SoReceiveBoxesDao, So
// 获取箱号 // 获取箱号
receiveBoxRollsEntity.setBoxNo(soReceiveBoxesEntity.getBoxNo()); receiveBoxRollsEntity.setBoxNo(soReceiveBoxesEntity.getBoxNo());
SoReceiveBoxRollsEntity lastRoll = soReceiveBoxRollsService.boxLastRoll(receiveBoxRollsEntity); SoReceiveBoxRollsEntity lastRoll = soReceiveBoxRollsService.boxLastRoll(receiveBoxRollsEntity);
// 1.1.2 判断卷在该箱中 的生产日期是不是最晚的;
// 1.1.2 判断卷在该箱中 的生产日期是不是最晚的
if (!receiveBoxRollsEntity.getFinalRollNo().equals(lastRoll.getFinalRollNo())){ if (!receiveBoxRollsEntity.getFinalRollNo().equals(lastRoll.getFinalRollNo())){
throw new RuntimeException("请先移除该箱中卷生产日期最早得卷: "+lastRoll.getFinalRollNo()); throw new RuntimeException("请先移除该箱中卷生产日期最早得卷: "+lastRoll.getFinalRollNo());
} }
@ -123,7 +123,6 @@ public class SoReceiveBoxesServiceImpl extends ServiceImpl<SoReceiveBoxesDao, So
SoReceiveBoxRollsEntity removeBoxRollsEntity = new SoReceiveBoxRollsEntity(); SoReceiveBoxRollsEntity removeBoxRollsEntity = new SoReceiveBoxRollsEntity();
removeBoxRollsEntity.setBoxNo(soReceiveBoxesEntity.getBoxNo()); removeBoxRollsEntity.setBoxNo(soReceiveBoxesEntity.getBoxNo());
List<SoReceiveBoxRollsEntity> soReceiveBoxRollsEntityList = this.baseMapper.searchBoxRolls(removeBoxRollsEntity); List<SoReceiveBoxRollsEntity> soReceiveBoxRollsEntityList = this.baseMapper.searchBoxRolls(removeBoxRollsEntity);
if (soReceiveBoxRollsEntityList.size() == 0) { if (soReceiveBoxRollsEntityList.size() == 0) {
remove(new QueryWrapper<SoReceiveBoxesEntity>().eq("box_no", soReceiveBoxesEntity.getBoxNo())); remove(new QueryWrapper<SoReceiveBoxesEntity>().eq("box_no", soReceiveBoxesEntity.getBoxNo()));
} else { } else {

4
src/main/resources/mapper/finishedProduct/PackingDao.xml

@ -37,9 +37,7 @@
</where> </where>
</select> </select>
<select id="getCustomerId" resultType="java.lang.String"> <select id="getCustomerId" resultType="java.lang.String">
SELECT ConfigurationTemplateID
FROM part
WHERE PartNo = #{partNo}
select top 1 客户编码 from view_Print_ROll_Label_1 where 物料编码 = #{partNo}
</select> </select>
<select id="getMPNByPartNo" resultType="java.lang.String"> <select id="getMPNByPartNo" resultType="java.lang.String">
select MPN select MPN

4
src/main/resources/static/pda/js/productwarehouse/storage.js

@ -92,11 +92,9 @@ $("#rollNo").bind("keydown", function (event) {
//校验仓库编号是否存在 //校验仓库编号是否存在
function getWareHouse() { function getWareHouse() {
var warehouseId = $("#warehouseId").val() var warehouseId = $("#warehouseId").val()
var warehouse = { var warehouse = {
warehouseid: warehouseId warehouseid: warehouseId
} }
$.ajax({ $.ajax({
url: "/warehouse/getWarehouse", url: "/warehouse/getWarehouse",
contentType: 'application/json', contentType: 'application/json',
@ -127,7 +125,6 @@ function submitToStorage() {
var rollNumber = $("#rollNumber").val() var rollNumber = $("#rollNumber").val()
var warehouseId = $("#warehouseId").val() var warehouseId = $("#warehouseId").val()
var display = $("#display").val() var display = $("#display").val()
let saveRollStorage = { let saveRollStorage = {
partNo: $("#partNo").val(), partNo: $("#partNo").val(),
storageNumber: $("#storageNumber").val(), storageNumber: $("#storageNumber").val(),
@ -171,7 +168,6 @@ function submitToStorage() {
$("#rollNo").val(''); $("#rollNo").val('');
$("#storageNumber").val('') $("#storageNumber").val('')
$("#rollNumber").val('') $("#rollNumber").val('')
$("#warehouseId").val('')
$("#display").val('') $("#display").val('')
$("#partName").val('') $("#partName").val('')
layer.msg('入库成功') layer.msg('入库成功')

Loading…
Cancel
Save