自动化立体仓库 - WMS系统
lty
2025-05-05 ce0fcdaf2629e5b6ebef0f206b16ecad103e5c1e
#盘点上报
9个文件已修改
82 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/entity/CheckDetl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/CheckDetlServiceImpl.java 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/CheckDetlMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/LocDetlMapper.xml 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/locDetlStatis/check.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/locDetlStatis/check.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/CheckDetl.java
@@ -30,6 +30,10 @@
    @ExcelProperty("数量")
    private Double anfme;
    @ApiModelProperty(value= "盘点数量")
    @ExcelProperty("盘点数量")
    private Double number;
    @ApiModelProperty(value= "商品编号")
    @ExcelProperty("商品编号")
    private String matnr;
src/main/java/com/zy/asrs/service/impl/CheckDetlServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.CheckDetl;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.mapper.CheckDetlMapper;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.CheckDetlService;
@@ -27,12 +28,11 @@
@Service
@Slf4j
public class CheckDetlServiceImpl extends ServiceImpl<CheckDetlMapper, CheckDetl> implements CheckDetlService {
    @Value("${erp.address.URL}")
    @Value("${erp.newaddress.UPLOADURL}")
    //端口
    private String URL;
    @Value("${erp.address.outaddressSubmit}")
    //上报出入库地址
    private String outaddressSubmit;
    @Value("${erp.newaddress.uploadaddressSubmit}")
    private String uploadAddress;
    @Autowired
    private CheckDetlService checkDetlService;
    @Autowired
@@ -47,18 +47,23 @@
    public void upload(List<CheckDetl> list) {
        Date now = new Date();
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        // 构建主单 JSON 数据
        JSONObject requestBody = new JSONObject();
        requestBody.put("createTime", sdf.format(now));
        if (!list.isEmpty()) {
            CheckDetl first = list.get(0);
            requestBody.put("orderNo", first.getOrderNo());
        }
        // 构建物料列表
        JSONArray matList = new JSONArray();
        for(CheckDetl checkDetl : list) {
            JSONObject mat = new JSONObject();
            mat.put("detailId", checkDetl.getDetailId());
            mat.put("orderNo", checkDetl.getOrderNo());
            mat.put("matnr", checkDetl.getMatnr());
            mat.put("anfme", checkDetl.getAnfme());
            mat.put("number", checkDetl.getNumber());
            matList.add(mat);
        }
        requestBody.put("data", matList);
@@ -66,14 +71,9 @@
        String response = "";
        boolean success = false;
        try {
            HashMap<String, Object> headers = new HashMap<>();
            //  cookie
            headers.put("Cookie", loginAuthenticationHandler.start().getContent());
            response = new HttpHandler.Builder()
                    .setHeaders(headers)
                    .setUri(URL)
                    .setPath(outaddressSubmit) // 设置你的接口路径
                    .setPath(uploadAddress) // 设置你的接口路径
                    .setJson(requestBody.toJSONString())
                    .build()
                    .doPost();
@@ -91,7 +91,7 @@
            try {
                apiLogService.save(
                        "盘点上报",
                        URL + outaddressSubmit,
                        URL + uploadAddress,
                        null,
                        "127.0.0.1",
                        requestBody.toJSONString(),
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -635,7 +635,8 @@
                if (diff != 0) {
                    CheckDetl checkDetl = new CheckDetl();
                    checkDetl.setOrderNo(param.getOrderNo());
                    checkDetl.setAnfme(diff);  //这里记录差值
                    checkDetl.setAnfme(matParam.getAnfme());  //账面数量
                    checkDetl.setNumber(LKAnfme);
                    checkDetl.setMatnr(matParam.getMatnr());
                    checkDetl.setMaktx(matParam.getMaktx());
                    checkDetl.setSpecs(matParam.getSpecs());
src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java
@@ -33,15 +33,15 @@
    //登录地址
    private String loginaddress;
    @Value("${erp.login.acctID}")
    @Value("${erp.login.sAcctID}")
    //账号ID
    private String acctID;
    @Value("${erp.login.username}")
    @Value("${erp.login.sUserId}")
    //账号
    private String username;
    @Value("${erp.login.password}")
    @Value("${erp.login.sPassword}")
    //密码
    private String password;
src/main/resources/application.yml
@@ -94,9 +94,22 @@
    outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc
    #结果上报(审核)单地址
    outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
  #  地址
  newaddress:
    #单据上报地址
    URL: http://10.10.0.59:33117
    #单据提交
    orderaddressSubmit: api/U8Voucher
    #盘点上报地址
    UPLOADURL: http://10.10.0.10:2501
    # 盘点地址
    uploadaddressSubmit: api/CheckVouch/pypk
  #  登录账号管理
  login :
    acctID: "647e849ab6fa0f"
    username: "llw"
    password: "666666"
    lcid: 2052
    sAcctID: "999"
    sUserId: "demo"
    sPassword: "DEMO"
    sServer: "10.1.9.20"
    lcid: 1234
src/main/resources/mapper/CheckDetlMapper.xml
@@ -8,6 +8,7 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.CheckDetl">
        <result column="anfme" property="anfme"/>
        <result column="number" property="number"/>
        <result column="matnr" property="matnr"/>
        <result column="maktx" property="maktx"/>
        <result column="specs" property="specs"/>
src/main/resources/mapper/LocDetlMapper.xml
@@ -48,12 +48,14 @@
    <resultMap id="CheckResultMap" type="com.zy.asrs.entity.CheckDetl">
        <result column="anfme" property="anfme" />
        <result column="number" property="number"/>
        <result column="matnr" property="matnr" />
        <result column="maktx" property="maktx" />
        <result column="specs" property="specs" />
        <result column="batch" property="batch" />
        <result column="create_time" property="createTime"/>
        <result column="order_no" property="orderNo"/>
        <result column="detail_id"  property="detailId"/>
    </resultMap>
    <sql id="batchSeq">
@@ -119,8 +121,11 @@
        <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 test="orderNo!=null and orderNo!='' ">
            and a.order_no like '%' + #{orderNo} + '%'
        </if>
        <if test="detail_id!=null and detail_id!='' ">
            and a.detail_id like '%' + #{detail_id} + '%'
        </if>
    </sql>
@@ -188,7 +193,9 @@
        a.specs,
        a.batch,
        a.create_time,
        a.order_no
        a.order_no,
        a.detail_id,
        a.number
        from asr_check_detl a
        where 1=1
        <include refid="stockOutCondition" />
src/main/webapp/static/js/locDetlStatis/check.js
@@ -21,7 +21,8 @@
        cols: [[
            {type: 'checkbox'},
            {field: 'orderNo', align: 'center',title: '盘点单编号', style: 'font-weight: bold'},
            {field: 'anfme', align: 'center',title: '盘点盈亏', style: 'font-weight: bold'},
            {field: 'anfme', align: 'center',title: '账面数量', style: 'font-weight: bold'},
            {field: 'number', 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'},
            {field: 'maktx', align: 'center',title: '商品名称', style: 'font-weight: bold'},
src/main/webapp/views/locDetlStatis/check.html
@@ -19,6 +19,11 @@
      <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
    </div>
  </div>
  <div class="layui-inline">
    <div class="layui-input-inline">
      <input class="layui-input" type="text" name="orderNo" placeholder="盘点编号" autocomplete="off">
    </div>
  </div>
  <!-- 待添加 -->
  <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
    <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索