From 0ad46baf0dc8247c4dc88b13e7126c532bc14951 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 13 六月 2025 19:42:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/nc/entity/NccXsckmxTkWms.java | 60 ++++++++++++++++++++
src/main/java/com/zy/nc/service/NccXsckmxTkWmsService.java | 11 +++
src/main/java/com/zy/asrs/controller/MobileController.java | 27 ++++----
src/main/java/com/zy/nc/service/impl/NccXsckmxTkWmsServiceImpl.java | 25 ++++++++
src/main/java/com/zy/nc/mapper/NccXsckmxTkWmsMapper.java | 18 ++++++
src/main/resources/mapper/nc/NccXsckmxTkWmsMapper.xml | 22 +++++++
6 files changed, 150 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 1a0932c..9341fae 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/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);
}
diff --git a/src/main/java/com/zy/nc/entity/NccXsckmxTkWms.java b/src/main/java/com/zy/nc/entity/NccXsckmxTkWms.java
new file mode 100644
index 0000000..a5cd295
--- /dev/null
+++ b/src/main/java/com/zy/nc/entity/NccXsckmxTkWms.java
@@ -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;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/nc/mapper/NccXsckmxTkWmsMapper.java b/src/main/java/com/zy/nc/mapper/NccXsckmxTkWmsMapper.java
new file mode 100644
index 0000000..53918f7
--- /dev/null
+++ b/src/main/java/com/zy/nc/mapper/NccXsckmxTkWmsMapper.java
@@ -0,0 +1,18 @@
+package com.zy.nc.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.nc.entity.NccXsckmxTkWms;
+
+/**
+* @author zc857
+* @description 閽堝琛ㄣ�恘cc_xsckmx_tk_wms銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2025-06-04 16:01:00
+* @Entity com.zy.nc.entity.NccScPcdaWms
+*/
+public interface NccXsckmxTkWmsMapper extends BaseMapper<NccXsckmxTkWms> {
+
+}
+
+
+
+
diff --git a/src/main/java/com/zy/nc/service/NccXsckmxTkWmsService.java b/src/main/java/com/zy/nc/service/NccXsckmxTkWmsService.java
new file mode 100644
index 0000000..dcb8736
--- /dev/null
+++ b/src/main/java/com/zy/nc/service/NccXsckmxTkWmsService.java
@@ -0,0 +1,11 @@
+package com.zy.nc.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.nc.entity.NccXsckmxTkWms;
+
+/**
+* @description 閽堝琛ㄣ�恘cc_xsckmx_tk_wms銆戠殑鏁版嵁搴撴搷浣淪ervice
+*/
+public interface NccXsckmxTkWmsService extends IService<NccXsckmxTkWms> {
+
+}
diff --git a/src/main/java/com/zy/nc/service/impl/NccXsckmxTkWmsServiceImpl.java b/src/main/java/com/zy/nc/service/impl/NccXsckmxTkWmsServiceImpl.java
new file mode 100644
index 0000000..57297fd
--- /dev/null
+++ b/src/main/java/com/zy/nc/service/impl/NccXsckmxTkWmsServiceImpl.java
@@ -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 閽堝琛ㄣ�恘cc_xsckmx_tk_wms銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2025-06-04 16:01:00
+*/
+@Service
+public class NccXsckmxTkWmsServiceImpl extends ServiceImpl<NccXsckmxTkWmsMapper, NccXsckmxTkWms>
+ implements NccXsckmxTkWmsService {
+
+}
+
+
+
+
diff --git a/src/main/resources/mapper/nc/NccXsckmxTkWmsMapper.xml b/src/main/resources/mapper/nc/NccXsckmxTkWmsMapper.xml
new file mode 100644
index 0000000..9c8ea05
--- /dev/null
+++ b/src/main/resources/mapper/nc/NccXsckmxTkWmsMapper.xml
@@ -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>
--
Gitblit v1.9.1