#

lty

9 天以前 e6a09e06c1d9f6d8bc16e0af0d204deee46ba3df

#

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

@@ -98,7 +98,9 @@
                , String.valueOf(tagId)
                , param.get("matnr")
                , param.get("maktx")
                , param.get("specs"))
                , param.get("specs")
                , param.get("model"))

        );

    }

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

@@ -15,7 +15,7 @@
public interface MatMapper extends BaseMapper<Mat> {

    List<Mat> listByPage(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr,  @Param("maktx") Object maktx);
    List<Mat> listByPage2(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr,  @Param("maktx") Object maktx,  @Param("specs") Object specs);
    List<Mat> listByPage2(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr,  @Param("maktx") Object maktx,  @Param("specs") Object specs,@Param("model") Object model);

    Mat selectByMatnr(@Param("matnr")String matnr);


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

@@ -9,7 +9,7 @@
public interface MatService extends IService<Mat> {

    Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx);
    Page<Mat> getPage2(Page page, String tagId, Object matnr, Object maktx, Object specs);
    Page<Mat> getPage2(Page page, String tagId, Object matnr, Object maktx, Object specs,Object model);

    Mat selectByMatnr(String matnr);
    List<Mat> selectByMatnrLink(String matnr);

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

@@ -17,8 +17,8 @@
        return page.setRecords(baseMapper.listByPage(page, tagId, matnr, maktx));
    }
    @Override
    public Page<Mat> getPage2(Page page, String tagId, Object matnr, Object maktx, Object specs) {
        return page.setRecords(baseMapper.listByPage2(page, tagId, matnr, maktx, specs));
    public Page<Mat> getPage2(Page page, String tagId, Object matnr, Object maktx, Object specs,Object model) {
        return page.setRecords(baseMapper.listByPage2(page, tagId, matnr, maktx, specs,model));
    }



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

@@ -189,6 +189,7 @@
                    waitPakin.setProType(orderDetl.getProType());
                    waitPakin.setLuHao(orderDetl.getLuHao());
                    waitPakin.setPacking(orderDetl.getPacking());
                    waitPakin.setTemp2(orderDetl.getTemp2());
                    if (!waitPakinService.insert(waitPakin)) {
                        throw new CoolException("保存入库通知档失败");
                    }

 src/main/java/com/zy/common/web/WcsController.java

@@ -381,7 +381,7 @@
                    wrkDetl.setProType(orderDetl.getProType());
                    wrkDetl.setSPgNO(orderDetl.getSPgNO());
                    wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
//                    wrkDetl.setLuHao(orderDetl.getLuHao());
                    wrkDetl.setLuHao(orderDetl.getLuHao());
                    wrkDetl.setSupp(orderDetl.getSupp());
                    wrkDetl.setSuppCode(orderDetl.getSuppCode());
                    wrkDetl.setPacking(orderDetl.getPacking());

 src/main/java/com/zy/third/erp/task/ERPInOrOutService.java

@@ -119,7 +119,7 @@
            orderDetl.setOutOrderNo(outDetTB.getOrderNo());
            orderDetl.setAutoId(outDetTB.getAutoId());
            orderDetl.setDetId(outDetTB.getDetId());
//            orderDetl.setLuHao(outDetTB.getLuHao());
            orderDetl.setLuHao(outDetTB.getFactArea());
//            orderDetl.setSpecs(outDetTB.getSPgNO());
            orderDetl.setPacking(outDetTB.getPacking());
            orderDetl.setSuppCode(inHedTB.getObjectId());
@@ -225,7 +225,7 @@
            orderDetl.setAutoId(outDetTB.getAutoId());
            orderDetl.setSpecs(mat.getSpecs());
            orderDetl.setDetId(outDetTB.getDetId());
//            orderDetl.setLuHao(outDetTB.getLuHao());
            orderDetl.setLuHao(outDetTB.getFactArea());
            orderDetl.setSpecs(outDetTB.getSPgNO());
            orderDetl.setSuppCode(inHedTB.getObjectId());
            orderDetl.setSupp(inHedTB.getObjectName());

 src/main/resources/mapper/MatMapper.xml

@@ -96,6 +96,10 @@
        <if test="specs != null and specs != ''">
            and mm.specs like concat('%',#{specs},'%')
        </if>
        <if test="model != null and model != ''">
            and mm.model like concat('%',#{model},'%')
        </if>

        ORDER BY mm.create_time DESC
    </select>


 src/main/resources/mapper/OrderMapper.xml

@@ -114,10 +114,10 @@
        FROM man_order
        WHERE 1=1
        <if test="orderNo != null and orderNo != ''">
            AND order_no COLLATE Chinese_PRC_CI_AS LIKE CONCAT('%', #{orderNo}, '%')
            AND order_no LIKE '%' + #{orderNo} + '%'
        </if>
        AND doc_type IN (34, 36, 37, 39, 40)
        AND status IN (1, 2)
        AND settle IN (1, 2)
        ORDER BY create_time DESC
    </select>


 src/main/webapp/views/mat/mat.html

@@ -98,6 +98,12 @@
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">商品代码:</label>
                            <div class="layui-input-inline">
                                <input name="model" class="layui-input" placeholder="输入商品代码"/>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">商品规格:</label>
                            <div class="layui-input-inline">
                                <input name="specs" class="layui-input" placeholder="输入商品规格"/>