xtywms.git - Gitblit

parent: 5e62f7e9 | 补丁 | 提交 | ignore whitespace

王佳豪

2021-06-25 754bc2945aa5c91a510780d8e2c451c3bae576fb

1.发货通知-平仓出库支持生产单号的搜索过滤

6个文件已修改

	src/main/java/com/zy/asrs/controller/OutStockController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/mapper/LocNormalMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/service/LocNormalService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/LocNormalMapper.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/pakStore/outStockNormalDetail.html	42 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/java/com/zy/asrs/controller/OutStockController.java

@@ -89,8 +89,8 @@
     */
    @RequestMapping(value = "/outStock/query/locNormalList")
    @ManagerAuth
    public R queryMatWithLocNormal(String fbillNo) {
        List<LocNormal> list = locNormalService.queryLocNorlMatnr(fbillNo);
    public R queryMatWithLocNormal(String fbillNo, String mnemonic) {
        List<LocNormal> list = locNormalService.queryLocNorlMatnr(fbillNo, mnemonic);
        return R.ok(list);
    }


 src/main/java/com/zy/asrs/mapper/LocNormalMapper.java

@@ -40,5 +40,5 @@

    public void pdaLocNormalMove(List<LocNormal> list);

    public List<LocNormal> queryLocNorlMatnr(String matnr);
    public List<LocNormal> queryLocNorlMatnr(@Param("matnr") String matnr, @Param("mnemonic") String mnemonic);
}

 src/main/java/com/zy/asrs/service/LocNormalService.java

@@ -31,7 +31,7 @@

  public void pdaLocNormalMove(List<LocNormal> list);

  public List<LocNormal> queryLocNorlMatnr(String fbillNo);
  public List<LocNormal> queryLocNorlMatnr(String fbillNo, String mnemonic);


}

 src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java

@@ -513,12 +513,12 @@
    }

    @Override
    public List<LocNormal> queryLocNorlMatnr(String fbillNo) {
    public List<LocNormal> queryLocNorlMatnr(String fbillNo, String mnemonic) {
        List<OutStockBillEntry> matList = outStockMapper.queryMatnrWithBillNo(fbillNo);
        List<LocNormal> locNormal = new ArrayList<>();
        List<LocNormal> locNormalResult = new ArrayList<>();
        for (Integer i = 0; i < matList.size(); i++) {
            locNormal = baseMapper.queryLocNorlMatnr(matList.get(i).getFnumber()) ;
            locNormal = baseMapper.queryLocNorlMatnr(matList.get(i).getFnumber(), mnemonic) ;
            if (locNormal.size() > 0) {
                for (LocNormal e:locNormal) {
                    LocNormal obj = new LocNormal();

 src/main/resources/mapper/LocNormalMapper.xml

@@ -125,5 +125,8 @@
    <select id="queryLocNorlMatnr" resultMap="BaseResultMap">
        select a.*,b.name as warehouseName from asr_loc_normal a left join asr_loc_area b on a.warehouse = b.uuid
        where matnr = #{matnr} and state = '1'
        <if test="mnemonic != null and mnemonic != ''">
            and mnemonic = #{mnemonic}
        </if>
    </select>
</mapper>

 src/main/webapp/views/pakStore/outStockNormalDetail.html

@@ -14,6 +14,18 @@
</head>
<body>
<div>
    <div style="padding-top: 8px; padding-left: 8px">
        <div class="layui-form-item">
            <div class="layui-input-inline">
                <input id="mnemonic" placeholder="请输入生产单号" class="layui-input" lay-verify="mnemonic" autocomplete="off">
            </div>
            <div id="data-search-btn" style="display: inline-block; margin: 0" class="layui-btn-container layui-form-item">
                <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit onclick="onSearch()">搜索</button>
                <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit onclick="reload()">重置</button>
            </div>
        </div>

    </div>
    <div class="layui-form" style="padding-top: 8px; padding-left: 8px">
        <button style="margin-bottom: 0px" class="layui-btn layui-btn-sm layui-form-item" style="display: inline-block"
                id="outbound" lay-submit
@@ -92,6 +104,12 @@
                                id: item.id,
                                matnr: item.matnr,
                                supplier: item.supplier,
                                mnemonic: item.mnemonic,
                                warehouse: item.warehouse,
                                warehouseName: item.warehouseName,
                                maktx: item.maktx,
                                lgnum: item.lgnum,
                                type: item.type,
                            }
                            sourceData.push(obj);
                        });
@@ -156,5 +174,29 @@
        }
    }

    function onSearch() {
        var mnemonic = $("#mnemonic").val();
        locDetlTableIns.reload({
            where: {
                mnemonic: mnemonic,
            }
        });
    }

    function reload() {
        var mnemonic = ""
        $("#mnemonic").val(mnemonic);
        locDetlTableIns.reload({
            where: {
                mnemonic: mnemonic,
            }
        });
    }

    $('body').keydown(function () {
        if (event.keyCode === 13) {
            onSearch();
        }
    });
</script>
</html>

			@@ -89,8 +89,8 @@
			*/
			@RequestMapping(value = "/outStock/query/locNormalList")
			@ManagerAuth
			public R queryMatWithLocNormal(String fbillNo) {
			List<LocNormal> list = locNormalService.queryLocNorlMatnr(fbillNo);
			public R queryMatWithLocNormal(String fbillNo, String mnemonic) {
			List<LocNormal> list = locNormalService.queryLocNorlMatnr(fbillNo, mnemonic);
			return R.ok(list);
			}

			@@ -40,5 +40,5 @@

			public void pdaLocNormalMove(List<LocNormal> list);

			public List<LocNormal> queryLocNorlMatnr(String matnr);
			public List<LocNormal> queryLocNorlMatnr(@Param("matnr") String matnr, @Param("mnemonic") String mnemonic);
			}

			@@ -31,7 +31,7 @@

			public void pdaLocNormalMove(List<LocNormal> list);

			public List<LocNormal> queryLocNorlMatnr(String fbillNo);
			public List<LocNormal> queryLocNorlMatnr(String fbillNo, String mnemonic);


			}

			@@ -513,12 +513,12 @@
			}

			@Override
			public List<LocNormal> queryLocNorlMatnr(String fbillNo) {
			public List<LocNormal> queryLocNorlMatnr(String fbillNo, String mnemonic) {
			List<OutStockBillEntry> matList = outStockMapper.queryMatnrWithBillNo(fbillNo);
			List<LocNormal> locNormal = new ArrayList<>();
			List<LocNormal> locNormalResult = new ArrayList<>();
			for (Integer i = 0; i < matList.size(); i++) {
			locNormal = baseMapper.queryLocNorlMatnr(matList.get(i).getFnumber()) ;
			locNormal = baseMapper.queryLocNorlMatnr(matList.get(i).getFnumber(), mnemonic) ;
			if (locNormal.size() > 0) {
			for (LocNormal e:locNormal) {
			LocNormal obj = new LocNormal();

			@@ -125,5 +125,8 @@
			<select id="queryLocNorlMatnr" resultMap="BaseResultMap">
			select a.*,b.name as warehouseName from asr_loc_normal a left join asr_loc_area b on a.warehouse = b.uuid
			where matnr = #{matnr} and state = '1'
			<if test="mnemonic != null and mnemonic != ''">
			and mnemonic = #{mnemonic}
			</if>
			</select>
			</mapper>

			@@ -14,6 +14,18 @@
			</head>
			<body>
			<div>
			<div style="padding-top: 8px; padding-left: 8px">
			<div class="layui-form-item">
			<div class="layui-input-inline">
			<input id="mnemonic" placeholder="请输入生产单号" class="layui-input" lay-verify="mnemonic" autocomplete="off">
			</div>
			<div id="data-search-btn" style="display: inline-block; margin: 0" class="layui-btn-container layui-form-item">
			<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit onclick="onSearch()">搜索</button>
			<button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit onclick="reload()">重置</button>
			</div>
			</div>

			</div>
			<div class="layui-form" style="padding-top: 8px; padding-left: 8px">
			<button style="margin-bottom: 0px" class="layui-btn layui-btn-sm layui-form-item" style="display: inline-block"
			id="outbound" lay-submit
			@@ -92,6 +104,12 @@
			id: item.id,
			matnr: item.matnr,
			supplier: item.supplier,
			mnemonic: item.mnemonic,
			warehouse: item.warehouse,
			warehouseName: item.warehouseName,
			maktx: item.maktx,
			lgnum: item.lgnum,
			type: item.type,
			}
			sourceData.push(obj);
			});
			@@ -156,5 +174,29 @@
			}
			}

			function onSearch() {
			var mnemonic = $("#mnemonic").val();
			locDetlTableIns.reload({
			where: {
			mnemonic: mnemonic,
			}
			});
			}

			function reload() {
			var mnemonic = ""
			$("#mnemonic").val(mnemonic);
			locDetlTableIns.reload({
			where: {
			mnemonic: mnemonic,
			}
			});
			}

			$('body').keydown(function () {
			if (event.keyCode === 13) {
			onSearch();
			}
			});
			</script>
			</html>