#新增盘点单号，页面修改

lty

4 天以前 c27d3ae9d5130a230e1dcb59abd4e8851dceb9d6

#新增盘点单号，页面修改

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

@@ -51,7 +51,7 @@
    public synchronized R syncStockUpload(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) List<MatSyncParam> param,
                                      HttpServletRequest request){
        auth(appkey, param, request);
//        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }

 src/main/java/com/zy/asrs/entity/CheckDetl.java

@@ -16,6 +16,12 @@
@TableName("asr_check_detl")
@ExcelIgnoreUnannotated
public class CheckDetl implements Serializable {

    @ApiModelProperty(value= "盘点单编号")
    @ExcelProperty("盘点单编号")
    private String orderNo;


    @ApiModelProperty(value= "数量")
    @ExcelProperty("数量")
    private Double anfme;

 src/main/java/com/zy/asrs/entity/param/MatSyncParam.java

@@ -11,10 +11,10 @@
@Data
public class MatSyncParam {

//    /**
//     *  创建时间
//     */
//    public String createTime;
    /**
     *  orderNo订单编号
     */
    public String orderNo;

    public List<MatParam> data;


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

@@ -615,6 +615,10 @@
                throw new CoolException("物料数据为空");
            }

            if (Cools.isEmpty(param.getOrderNo()) || param.getOrderNo().isEmpty()) {
                throw new CoolException("盘点单编号为空");
            }

            for (MatSyncParam.MatParam matParam : param.getData()) {
                if (Cools.isEmpty(matParam.getMatnr())) {
                    throw new CoolException("商品编码为空");
@@ -630,10 +634,12 @@

                if (diff != 0) {
                    CheckDetl checkDetl = new CheckDetl();
                    checkDetl.setOrderNo(param.getOrderNo());
                    checkDetl.setAnfme(diff);  //这里记录差值
                    checkDetl.setMatnr(matParam.getMatnr());
                    checkDetl.setMaktx(matParam.getMaktx());
                    checkDetl.setSpecs(matParam.getSpecs());
                    checkDetl.setBatch(matParam.getBatch());
                    checkDetl.setCreateTime(new Date());

                    checkDetlService.insert(checkDetl);  // 插入差异记录
@@ -641,11 +647,5 @@
            }
        }
    }







}

 src/main/resources/mapper/CheckDetlMapper.xml

@@ -13,6 +13,7 @@
        <result column="specs" property="specs"/>
        <result column="batch" property="batch"/>
        <result column="create_time" property="createTime"/>
        <result column="order_no" property="orderNo"/>
    </resultMap>



 src/main/resources/mapper/LocDetlMapper.xml

@@ -53,6 +53,7 @@
        <result column="specs" property="specs" />
        <result column="batch" property="batch" />
        <result column="create_time" property="createTime"/>
        <result column="order_no" property="orderNo"/>
    </resultMap>

    <sql id="batchSeq">
@@ -117,6 +118,9 @@
        </if>
        <if test="specs!=null and specs!='' ">
            and a.specs like '%' + #{specs} + '%'
        </if>
        <if test="order_no!=null and order_no!='' ">
            and a.order_no like '%' + #{order_no} + '%'
        </if>
    </sql>

@@ -183,7 +187,8 @@
        a.maktx,
        a.specs,
        a.batch,
        a.create_time
        a.create_time,
        a.order_no
        from asr_check_detl a
        where 1=1
        <include refid="stockOutCondition" />

 src/main/webapp/static/js/locDetlStatis/check.js

@@ -23,7 +23,8 @@
//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
//             ,{field: 'typeId', align: 'center',title: '路径ID'}
            // ,{field: 'typeDesc', align: 'center',title: '作业类型'}
            {field: 'anfme', align: 'center',title: '库存数量(正少/负多）', style: 'font-weight: bold'},
            {field: 'orderNo', align: 'center',title: '盘点单编号', style: 'font-weight: bold'},
            {field: 'anfme', align: 'center',title: '盘点盈亏', style: 'font-weight: bold'},
            {field: 'createTime$', align: 'center',title: '创建时间', style: 'font-weight: bold'},
            {field: 'matnr', align: 'center',title: '商品编号', style: 'font-weight: bold'},

@@ -33,15 +34,13 @@

            // ,{field: 'appeUser$', align: 'center',title: '创建者',event: 'appeUser', style: 'cursor:pointer'}
            // ,{field: 'appeTime$', align: 'center',title: '添加时间'}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
        ]],
        request: {
            pageName: 'curr',
            pageSize: 'limit'
        },
        parseData: function (res) {
            // console.log(res)
            console.log(res)
            return {
                'code': res.code,
                'msg': res.msg,

 src/main/webapp/views/locDetlStatis/check.html

@@ -44,7 +44,7 @@

  <div class="layui-btn-container">
<!--    <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>-->
<!--    <button class="layui-btn layui-btn-primary" id="btn-init" lay-event="init">初始化</button>-->
    <button class="layui-btn layui-btn-sm" id="btn-init" lay-event="init">上报</button>
    <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>
    <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>
  </div>