#

Junjie

8 天以前 0ad46baf0dc8247c4dc88b13e7126c532bc14951

#

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

@@ -19,7 +19,9 @@
import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
import com.zy.nc.entity.NccJcQilibcBarcodeflowWms;
import com.zy.nc.entity.NccXsckmxTkWms;
import com.zy.nc.service.NccJcQilibcBarcodeflowWmsService;
import com.zy.nc.service.NccXsckmxTkWmsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -72,6 +74,9 @@

    @Autowired
    private OrderDetlPakinService orderDetlPakinService;

    @Autowired
    private NccXsckmxTkWmsService nccXsckmxTkWmsService;

    @RequestMapping("/pda/WarehouseOut/v1")
    @ManagerAuth(memo = "并板途中拣料-参考念初")
@@ -285,23 +290,19 @@
    @RequestMapping(value = "/mat/back")
    @ManagerAuth
    public R pdaSearchBack(@RequestParam String matnr) {
        EntityWrapper<NccJcQilibcBarcodeflowWms> wrapper = new EntityWrapper<>();
        wrapper.eq("VBARCODE", matnr).orderBy("ts", false);
        NccJcQilibcBarcodeflowWms nccJcQilibcBarcodeflowWms = nccJcQilibcBarcodeflowWmsService.selectOne(wrapper);
        if (null == nccJcQilibcBarcodeflowWms) {
        EntityWrapper<NccXsckmxTkWms> wrapper = new EntityWrapper<>();
        wrapper.like("VBATCHCODE", matnr);
        NccXsckmxTkWms nccXsckmxTkWms = nccXsckmxTkWmsService.selectOne(wrapper);
        if (null == nccXsckmxTkWms) {
            return R.error("未找到此条码");
        } else {
            if (!nccJcQilibcBarcodeflowWms.getInfla().equals("出库")) {
                return R.error("该条码最后一次不是出库");
            }
        }
        Mat mat = matService.selectByMatnr(nccJcQilibcBarcodeflowWms.getWlbm());
        Mat mat = matService.selectByMatnr(nccXsckmxTkWms.getWlbm());
        MatParam matParam = new MatParam();
        Synchro.Copy(mat, matParam);
        matParam.setBatch(nccJcQilibcBarcodeflowWms.getVbatchcode());
        matParam.setAnfme(nccJcQilibcBarcodeflowWms.getAsnnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getAsnnum().doubleValue());
        matParam.setAnfme2(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue());
        matParam.setTiaoma(nccJcQilibcBarcodeflowWms.getVbarcode());
        matParam.setBatch(nccXsckmxTkWms.getVbatchcode());
        matParam.setAnfme(0.0D);
        matParam.setAnfme2(0.0D);
//        matParam.setTiaoma(nccJcQilibcBarcodeflowWms.getVbarcode());
        return R.ok().add(matParam);
    }


 src/main/java/com/zy/nc/entity/NccXsckmxTkWms.java

New file
@@ -0,0 +1,60 @@
package com.zy.nc.entity;

import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data;

/**
 * 
 * @TableName ncc_xsckmx_tk_wms
 */
@TableName(value ="ncc_xsckmx_tk_wms")
@Data
public class NccXsckmxTkWms {
    /**
     *
     */
    @TableId
    private String cgeneralbid;

    /**
     * 
     */
    private String vbatchcode;

    /**
     * 
     */
    private String csourcebilldate;

    /**
     * 
     */
    private String vsourcebillcode;

    /**
     * 
     */
    private String khbm;

    /**
     * 
     */
    private String khmc;

    /**
     * 
     */
    private String csourcebillhid;

    /**
     * 
     */
    private String csourcebillbid;

    /**
     * 
     */
    private String wlbm;

}

 src/main/java/com/zy/nc/mapper/NccXsckmxTkWmsMapper.java

New file
@@ -0,0 +1,18 @@
package com.zy.nc.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.nc.entity.NccXsckmxTkWms;

/**
* @author zc857
* @description 针对表【ncc_xsckmx_tk_wms】的数据库操作Mapper
* @createDate 2025-06-04 16:01:00
* @Entity com.zy.nc.entity.NccScPcdaWms
*/
public interface NccXsckmxTkWmsMapper extends BaseMapper<NccXsckmxTkWms> {

}





 src/main/java/com/zy/nc/service/NccXsckmxTkWmsService.java

New file
@@ -0,0 +1,11 @@
package com.zy.nc.service;

import com.baomidou.mybatisplus.service.IService;
import com.zy.nc.entity.NccXsckmxTkWms;

/**
* @description 针对表【ncc_xsckmx_tk_wms】的数据库操作Service
*/
public interface NccXsckmxTkWmsService extends IService<NccXsckmxTkWms> {

}

 src/main/java/com/zy/nc/service/impl/NccXsckmxTkWmsServiceImpl.java

New file
@@ -0,0 +1,25 @@
package com.zy.nc.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.nc.entity.NccScPcdaWms;
import com.zy.nc.entity.NccXsckmxTkWms;
import com.zy.nc.mapper.NccScPcdaWmsMapper;
import com.zy.nc.mapper.NccXsckmxTkWmsMapper;
import com.zy.nc.service.NccScPcdaWmsService;
import com.zy.nc.service.NccXsckmxTkWmsService;
import org.springframework.stereotype.Service;

/**
* @author zc857
* @description 针对表【ncc_xsckmx_tk_wms】的数据库操作Service实现
* @createDate 2025-06-04 16:01:00
*/
@Service
public class NccXsckmxTkWmsServiceImpl extends ServiceImpl<NccXsckmxTkWmsMapper, NccXsckmxTkWms>
    implements NccXsckmxTkWmsService {

}





 src/main/resources/mapper/nc/NccXsckmxTkWmsMapper.xml

New file
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.nc.mapper.NccXsckmxTkWmsMapper">

    <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccXsckmxTkWms">
        <result property="cgeneralbid" column="CGENERALBID" />
        <result property="vbatchcode" column="VBATCHCODE" />
        <result property="csourcebilldate" column="CSOURCEBILLDATE" />
        <result property="vsourcebillcode" column="VSOURCEBILLCODE" />
        <result property="khbm" column="KHBM" />
        <result property="khmc" column="KHMC" />
        <result property="csourcebillhid" column="CSOURCEBILLHID" />
        <result property="csourcebillbid" column="CSOURCEBILLBID" />
        <result property="wlbm" column="WLBM" />
    </resultMap>

    <sql id="Base_Column_List">
        CODE,NAME,SHORTNAME,wms_flag
    </sql>
</mapper>