优化轮询获取出库单

野心家

2024-08-30 d85016e8ca551b6672e123d3a56ac4c12554fb45

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

@@ -2,6 +2,7 @@

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -10,18 +11,26 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.InFormIdParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.TagService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.kingdee.handler.LoginAuthenticationHandler;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
import com.zy.common.entity.MatExcel;
import com.zy.common.utils.BarcodeUtils;
import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.QrCode;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -31,24 +40,46 @@
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;

@RestController
@Slf4j
public class MatController extends BaseController {

    @Value("${erp.address.URL}")
    //端口
    private String URL;

    @Value("${erp.address.inaddress}")
    //单据，商品档案地址
    private String inaddress;

    @Autowired
    private TagService tagService;

    @Autowired
    private ApiLogService apiLogService;
    @Autowired
    private MatService matService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private LoginAuthenticationHandler loginAuthenticationHandler;

    @RequestMapping(value = "/mat/auto/matnr/auth")
    public R autoMatnr(){
    public R autoMatnr() {
        return R.ok().add("YJ" + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss).substring(0, 16));
    }

    @RequestMapping(value = "/mat/list/pda/auth")
    @ManagerAuth
    public R pdaList(@RequestParam(required = true)Long tagId){
    public R pdaList(@RequestParam(required = true) Long tagId) {
        EntityWrapper<Mat> wrapper = new EntityWrapper<>();
        wrapper.eq("tag_id", tagId);
        wrapper.orderBy("create_time", false);
@@ -58,7 +89,7 @@

    @RequestMapping(value = "/mat/search/pda/auth")
    @ManagerAuth
    public R pdaSearch(@RequestParam(required = false)String condition){
    public R pdaSearch(@RequestParam(required = false) String condition) {
        EntityWrapper<Mat> wrapper = new EntityWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like("matnr", condition).or().like("maktx", condition);
@@ -74,7 +105,7 @@
        return R.ok(matService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/matCode/auth0")
    @RequestMapping(value = "/mat/auth")
    @ManagerAuth
    public R find(@RequestParam("matnr") String matnr) {
        return R.ok(matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr)));
@@ -82,11 +113,11 @@

    @RequestMapping(value = "/mat/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam Map<String, Object> param) {
        Object tagId = param.get("tag_id");
        if (Cools.isEmpty(tagId)) {
            tagId = getOriginTag().getId();
@@ -94,15 +125,17 @@
        return R.ok(matService.getPage(new Page<>(curr, limit)
                , String.valueOf(tagId)
                , param.get("matnr")
                , param.get("maktx"))
                , param.get("maktx")
                , param.get("specs")
                , param.get("model"))
        );

    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
    private void convert(Map<String, Object> map, EntityWrapper wrapper) {
        for (Map.Entry<String, Object> entry : map.entrySet()) {
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -130,10 +163,158 @@
        return R.ok();
    }

   @RequestMapping(value = "/mat/update/auth")
   @ManagerAuth
    public R update(Mat mat){
        if (Cools.isEmpty(mat) || null==mat.getId()){
    @RequestMapping(value = "/mat/KingDeeadd/auth")
    @ManagerAuth
    public R KingDeeadd() {
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        //登录金蝶
        ReturnT<String> start = loginAuthenticationHandler.start();

        InFormIdParam inFormIdParam = new InFormIdParam();
        inFormIdParam.setFormId("BD_MATERIAL");
        inFormIdParam.setLimit(10000000);
        inFormIdParam.setStartRow("0");
        String FDocumentStatus = "C";

        // 获取当前日期
        LocalDate currentDate = LocalDate.now();
        // 获取前一个月的同一天
        LocalDate previousMonthDate = currentDate.minusMonths(1);

        // 格式化日期为 "yyyyMMdd" 格式
        DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
        String formattedDate2 = previousMonthDate.format(formatter1);

        //条件和需要获得的结果拼接
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("FormId", inFormIdParam.getFormId());
        jsonObject.put("Limit", inFormIdParam.getLimit());
        jsonObject.put("StartRow", inFormIdParam.getStartRow());
        jsonObject.put("FilterString", "FCreateDate>'" + formattedDate2 + "' and FDocumentStatus='" + FDocumentStatus + "' and FUseOrgId .FNumber='201'");
        jsonObject.put("FieldKeys", "FName,FNumber,FCreateDate,FSpecification,FDocumentStatus,FTuhao");
        // FName : 物料名称 ；
        // FNumber ：物料编号；
        // FCreateDate ：物料创建时间；
        // FSpecification ：物料规格；
        // FDocumentStatus ：物料状态
        JSONObject jsonObject1 = new JSONObject();
        jsonObject1.put("data", jsonObject);
        String add = jsonObject1.toJSONString();
        //上报
        String response = "";
        boolean success = false;
        try {
            //获取Cookie值
            HashMap<String, Object> headers = new HashMap<>();
            headers.put("Cookie", start.getContent());
            response = new HttpHandler.Builder()
                    .setHeaders(headers)
                    .setUri(URL)
                    .setPath(inaddress)
                    .setJson(add)
                    .build()
                    .doPost();
            JSONArray data = JSON.parseArray(response);
            int i = 0;
            if (data.size() > 0) {
                if (data.getJSONArray(0).get(0).toString().length() < 20) {
                    if (i == 0) {
                        for (int j = 0; j < data.size(); j++) {
                            JSONArray jsonArray = data.getJSONArray(j);
                            //生成商品档案
                            //商品编号
                            Mat mat = matService.selectByMatnr(jsonArray.get(1).toString());
                            if (mat == null) {
                                mat = new Mat();
                                Tag tag = new Tag();
                                mat.setMatnr(jsonArray.get(1).toString());
                                mat.setMaktx(jsonArray.get(0).toString());
                                mat.setSpecs(jsonArray.get(3).toString());//规格
                                mat.setModel(jsonArray.get(5).toString());//图号
                                mat.setTagId(20L);
                                //对美国时间进行转换
                                DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
                                DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
                                LocalDateTime dateTime = LocalDateTime.parse(jsonArray.get(2).toString(), formatter);
                                String format = dateFormat.format(dateTime);
                                Date date = sdf.parse(format);
                                mat.setCreateTime(date);//商品创建时间
                                mat.setUpdateTime(new Date());
                                mat.setStatus(1);
                                //最新抓取商品时间
                                tag.setCreateTime(date);
                                tagService.update(tag, new EntityWrapper<Tag>().eq("id", 20));
                                if (!matService.insert(mat)) {
                                    throw new CoolException("服务器内部错误，请联系管理员");
                                } else {
                                    log.info("同步新物料[商品编号：{}]", mat.getMatnr());
                                }
                            }
                        }
                    }
                }
            }

//            if (data.getJSONArray(0).get(0).toString().length() < 20) {
//                success = true;
//                JSONArray jsonArray = data.getJSONArray(0);
//                //生成商品档案
//                //商品编号
//                mat = matService.selectByMatnr(jsonArray.get(1).toString());
//                if (mat == null) {
//                    mat = new Mat();
//                    Tag tag = new Tag();
//                    mat.setMatnr(jsonArray.get(1).toString());
//                    mat.setMaktx(jsonArray.get(0).toString());
//                    mat.setSpecs(jsonArray.get(3).toString());//规格
//                    mat.setTagId(20L);
//                    //对美国时间进行转换
//                    DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
//                    DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
//                    LocalDateTime dateTime = LocalDateTime.parse(jsonArray.get(2).toString(), formatter);
//                    String format = dateFormat.format(dateTime);
//                    Date date = sdf.parse(format);
//                    mat.setCreateTime(date);//商品创建时间
//                    mat.setUpdateTime(new Date());
//                    mat.setStatus(1);
//                    //最新抓取商品时间
//                    tag.setCreateTime(date);
//                    tagService.update(tag, new EntityWrapper<Tag>().eq("id", 20));
//                    if (!matService.insert(mat)) {
//                        throw new CoolException("服务器内部错误，请联系管理员");
//                    } else {
//                        log.info("同步新物料[商品编号：{}]", mat.getMatnr());
//                    }
//                }
//            } else {
//                throw new CoolException("没有找到指定物料档案，请联系管理员");
//            }
        } catch (Exception e) {
            log.error("fail", e);
//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        } finally {
            try {
                // 保存接口日志
                apiLogService.save(
                        "轮询数据",
                        URL + inaddress,
                        null,
                        "127.0.0.1",
                        add,
                        response,
                        success
                );
            } catch (Exception e) {
                log.error("", e);
            }
        }
        return R.ok();
    }

    @RequestMapping(value = "/mat/update/auth")
    @ManagerAuth
    public R update(Mat mat) {
        if (Cools.isEmpty(mat) || null == mat.getId()) {
            return R.error();
        }
        mat.setUpdateBy(getUserId());
@@ -144,12 +325,18 @@

    @RequestMapping(value = "/mat/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam String param){
    @Transactional
    public R delete(@RequestParam String param) {
        List<Mat> list = JSONArray.parseArray(param, Mat.class);
        if (Cools.isEmpty(list)){
        if (Cools.isEmpty(list)) {
            return R.error();
        }
        for (Mat entity : list){

        for (Mat entity : list) {
            LocDetl locDetl = locDetlService.selectByMatnr(entity.getMatnr());
            if (!Cools.isEmpty(locDetl)) {
                throw new CoolException("当前物料在库，无法删除！");
            }
            if (!matService.delete(new EntityWrapper<>(entity))) {
                throw new CoolException("删除失败，请联系管理员");
            }
@@ -159,7 +346,7 @@

    @RequestMapping(value = "/mat/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
    public R export(@RequestBody JSONObject param) {
        EntityWrapper<Mat> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("mat"));
@@ -175,7 +362,7 @@
        wrapper.like("matnr", condition).or().like("maktx", condition);
        Page<Mat> page = matService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (Mat mat : page.getRecords()){
        for (Mat mat : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", mat.getId());
            map.put("value", mat.getMatnr() + "(" + mat.getMaktx() + ")");
@@ -188,10 +375,23 @@
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<Mat> wrapper = new EntityWrapper<Mat>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != matService.selectOne(wrapper)){
        if (null != matService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(Mat.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

    @RequestMapping(value = "/mat/covert/{id}/auth")
    @ManagerAuth
    public R covert(@PathVariable("id") String id) {
        Mat mat = matService.selectByMatnr(String.valueOf(id));
        if (mat == null) {
            return R.ok();
        }
        OrderDetl orderDetl = new OrderDetl();
        orderDetl.sync(mat);
        orderDetl.setAnfme(0.0D);
        return R.ok().add(orderDetl);
    }

    /*************************************** 打印相关 ***********************************************/
@@ -202,7 +402,7 @@
            , @RequestParam String param
            , HttpServletResponse response) throws Exception {
        AdminInterceptor.cors(response);
        if (Cools.isEmpty(param)){
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.EMPTY);
        }
        BufferedImage img;
@@ -223,11 +423,11 @@
    @RequestMapping(value = "/mat/print/auth")
    @ManagerAuth(memo = "商品编码打印")
    public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
        if(Cools.isEmpty(param)) {
        if (Cools.isEmpty(param)) {
            return R.parse(CodeRes.EMPTY);
        }
        List<MatPrint> res = new ArrayList<>();
        for (String matnr : param){
        for (String matnr : param) {
            Mat mat = matService.selectByMatnr(matnr);
            // 打印数据注入
            MatPrint print = new MatPrint();
@@ -268,13 +468,13 @@
    public R matExcelImport(MultipartFile file) throws IOException {
        MatExcelListener listener = new MatExcelListener(getUserId());
        EasyExcel.read(file.getInputStream(), MatExcel.class, listener).sheet().doRead();
        return R.ok("成功同步"+listener.getTotal()+"条商品数据");
        return R.ok("成功同步" + listener.getTotal() + "条商品数据");
    }

    /*************************************** xm-select ***********************************************/

    // xm-select 搜索商品列表
    @RequestMapping("/mat/all/get/kv0") // todo:luxiaotao
    @RequestMapping("/mat/all/get/kv")
    @ManagerAuth
    public R getMatDataKV(@RequestParam(required = false) String condition) {
        Wrapper<Mat> wrapper = new EntityWrapper<Mat>()
@@ -285,7 +485,7 @@
        for (Mat mat : mats) {
            KeyValueVo vo = new KeyValueVo();
            vo.setName(mat.getMatnr() + " - " + mat.getMaktx());
            vo.setValue(mat.getId());
            vo.setValue(mat.getMatnr());
            valueVos.add(vo);
        }
        return R.ok().add(valueVos);