#

18516761980

2023-03-05 3502e5aa420a6309e82c93a9f37062a3d3b5d4d3

#

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

@@ -193,6 +193,31 @@
        return R.ok("组托成功");
    }

    /**
     * 入库记录获取
     */
    @PostMapping("/inlog/v1")
    public synchronized R inlogERP(@RequestHeader(required = false) String appkey,
                                  HttpServletRequest request){
        auth(appkey,null, request);
        if (Cools.isEmpty()) {
            return R.parse(BaseRes.PARAM);
        }
        return R.ok().add(openService.inlogERP());
    }
    /**
     * 出库记录获取
     */
    @PostMapping("/outlog/v1")
    public synchronized R outlogERP(@RequestHeader(required = false) String appkey,
                                   HttpServletRequest request){
        auth(appkey,null, request);
        if (Cools.isEmpty()) {
            return R.parse(BaseRes.PARAM);
        }
        return R.ok("组托成功");
    }


    private void auth(String appkey, Object obj, HttpServletRequest request) {
        log.info("{}接口被访问；appkey:{}；请求数据：{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));

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

@@ -125,9 +125,11 @@

    @ApiModelProperty(value= "保质期")
    private String dead_time;
    private String deadTime=dead_time;

    @ApiModelProperty(value= "预警天数")
    private Integer dead_warn;
    private Integer deadWarn=this.dead_warn;

    @ApiModelProperty(value= "制购 1: 制造  2: 采购  3: 外协  ")
    private Integer source;
@@ -153,6 +155,61 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    //    工作号
    private Integer wrkNo;
    //    工作时间
    private Date ioTime;
    //单据编号
    private String orderNo;
    //单据时间
    private String manuDate;
    //品项数
    private String itemNum;
    //安全库存量
    private Double safeQty;
    //三方编码
    private String threeCode;
    //供应商编码
    private String suppCode;
    //是否批次 1: 是  0: 否
    private Integer beBatch;
    //    修改人员
    private Long modiUser;
    //    修改时间
    private Object modiTime;
    //    创建者
    private Long appeUser;
    //    添加时间
    private Object appeTime;
    public void sype(){
        //    工作号
        wrkNo=wrk_no;
        //    工作时间
        ioTime=io_time;
        //单据编号
        orderNo=order_no;
        //单据时间
        manuDate=manu_date;
        //品项数
        itemNum=item_num;
        //安全库存量
        safeQty=safe_qty;
        //三方编码
        threeCode=three_code;
        //供应商编码
        suppCode=supp_code;
        //是否批次 1: 是  0: 否
        beBatch=be_batch;
        //    修改人员
        modiUser=modi_user;
        //    修改时间
        modiTime=modi_time;
        //    创建者
        appeUser=appe_user;
        //    添加时间
        appeTime=appe_time;
    }

    public String getModiUser$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modi_user);

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

@@ -52,6 +52,8 @@
    public int getViewWorkInCount(ViewWorkInBean viewWorkIn);
    //不分页查询所有信息，用于excel导出
    public List<ViewWorkInBean> getViewWorkInAll(ViewWorkInBean viewWorkIn);
    //不分页查询所有信息，ERP调用
    public List<ViewWorkInBean> getViewWorkInERP();

    //分页查询日出库记录
    public List<ViewWorkInBean> queryViewWorkOutList(ViewWorkInBean viewWorkOut);

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

@@ -1,5 +1,6 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.ViewWorkInBean;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
@@ -49,4 +50,14 @@
     */
    void combMes(CombParam param);

    /**
     * 入库记录获取
     */
    List<ViewWorkInBean> inlogERP();

    /**
     * 出库记录获取
     */
    void outlogERP();

}

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

@@ -10,6 +10,7 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
@@ -56,6 +57,8 @@
    private WaitPakinService waitPakinService;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private ReportQueryMapper reportQueryMapper;

    @Override
    @Transactional
@@ -580,4 +583,28 @@
        }
    }

    /**
     * 入库记录获取
     */
    @Override
    @Transactional
    public List<ViewWorkInBean> inlogERP() {
        List<ViewWorkInBean> viewWorkInERP = reportQueryMapper.getViewWorkInERP();
        ArrayList<ViewWorkInBean> viewWorkInBeans = new ArrayList<>();
        for (ViewWorkInBean viewWorkInBean:viewWorkInERP){
            viewWorkInBean.sype();
            viewWorkInBeans.add(viewWorkInBean);
        }
        return viewWorkInBeans;
    }

    /**
     * 出库记录获取
     */
    @Override
    @Transactional
    public void outlogERP() {

    }

}

 src/main/resources/mapper/ViewWorkInMapper.xml

@@ -108,6 +108,13 @@
    <include refid="viewWorkInConditionSql"></include>
</select>

<!-- 不分页查询所有信息，ERP调用 -->
<select id="getViewWorkInERP" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
    select top 100 * from asr_wrkin_view
    where 1=1
    Order by io_time desc
</select>

<!-- 出库统计 -->
<!-- 分页查询所有信息 -->
<select id="queryViewWorkOutList" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">