liuxy/HuaDongYiYaoWMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev: 修改

Browse Source
This commit is contained in:
liuxy
2026-04-24 16:26:18 +08:00
parent cd33cde467
commit 47f967b11f
17 changed files with 472 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java
View File

@@ -110,4 +110,23 @@ public class MobileAuthorizationController {
}
return userInfo;
}
public SysUser loginCheckPc(AuthUserDto authUser) throws Exception {
String salt = "salt";
// 密码解密 - 前端的加密规则: encrypt（根据实际更改）
String password = authUser.getPassword();
// 校验数据库
// 根据用户名查询，在比对密码
// 拿到多个已经抛出异常
SysUser userInfo = userService.getOne(new LambdaQueryWrapper<SysUser>()
.eq(SysUser::getUsername, authUser.getUsername()));
if (ObjectUtil.isEmpty(userInfo) || !userInfo.getPassword().equals(SaSecureUtil.md5BySalt(password, salt))) {
throw new BadRequestException(LangProcess.msg("login_pwd"));
}
if (!userInfo.getIs_used()) {
throw new BadRequestException(LangProcess.msg("login_account"));
}
return userInfo;
}
}

24
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/MaterialbaseController.java
View File

@@ -77,5 +77,29 @@ public class MaterialbaseController {
iMdMeMaterialbaseService.download(map, response, product_area);
}
@PostMapping("/getClassList")
@Log("获取类别下拉框")
public ResponseEntity<Object> getClassList() {
return new ResponseEntity<>(iMdMeMaterialbaseService.getClassList(),HttpStatus.OK);
}
@PostMapping("/getSuppList")
@Log("获取供应商下拉框")
public ResponseEntity<Object> getSuppList() {
return new ResponseEntity<>(iMdMeMaterialbaseService.getSuppList(),HttpStatus.OK);
}
@PostMapping("/getUnitList")
@Log("获取计量单位下拉框")
public ResponseEntity<Object> getUnitList() {
return new ResponseEntity<>(iMdMeMaterialbaseService.getUnitList(),HttpStatus.OK);
}
@PostMapping("/deleteRow")
@Log("删除物料")
public ResponseEntity<Object> deleteRow(@Validated @RequestBody MdMeMaterialbase dto) {
iMdMeMaterialbaseService.deleteRow(dto);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
}

28
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdMeMaterialbaseService.java
View File

@@ -5,10 +5,14 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.basedata_manage.service.dao.MdCsSupplierbase;
import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
import org.nl.wms.basedata_manage.service.dao.MdPbClassstandard;
import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -70,4 +74,28 @@ public interface IMdMeMaterialbaseService extends IService<MdMeMaterialbase> {
void download(Map map, HttpServletResponse response, String[] product_area) throws IOException;
/**
* 获取类别下拉框
* @return List<MdPbClassstandard>
*/
List<MdPbClassstandard> getClassList();
/**
* 获取供应商
* @return List<MdCsSupplierbase>
*/
List<MdCsSupplierbase> getSuppList();
/**
* 获取计量单位下拉框
* @return List<MdPbMeasureunit>
*/
List<MdPbMeasureunit> getUnitList();
/**
* 删除物料
* @param dto
*/
void deleteRow(MdMeMaterialbase dto);
}

8
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java
View File

@@ -1,6 +1,8 @@
package org.nl.wms.basedata_manage.service.dao;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -207,5 +209,11 @@ public class MdMeMaterialbase implements Serializable {
*/
private String storage_conditions;
@TableField(exist = false)
private String username;
@TableField(exist = false)
private String password;
}

4
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdMeMaterialbaseMapper.xml
View File

@@ -68,6 +68,10 @@
mater.quality_code LIKE '%${param.class_code}%'or
class.class_code LIKE '%${param.class_code}%')
</if>
<if test="param.class_name != null and param.class_name != ''">
AND
class.class_code = #{param.class_name}
</if>
</where>
ORDER BY mater.update_time Desc

85
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java
View File

@@ -8,18 +8,31 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.SneakyThrows;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.FileUtil;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.config.SpringContextHolder;
import org.nl.system.controller.secutiry.MobileAuthorizationController;
import org.nl.system.service.logging.dao.SysLog;
import org.nl.system.service.secutiry.dto.AuthUserDto;
import org.nl.system.service.user.dao.SysUser;
import org.nl.wms.basedata_manage.service.IMdCsSupplierbaseService;
import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService;
import org.nl.wms.basedata_manage.service.IMdPbClassstandardService;
import org.nl.wms.basedata_manage.service.IMdPbMeasureunitService;
import org.nl.wms.basedata_manage.service.dao.MdCsSupplierbase;
import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
import org.nl.wms.basedata_manage.service.dao.MdPbClassstandard;
import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit;
import org.nl.wms.basedata_manage.service.dao.mapper.MdMeMaterialbaseMapper;
import org.nl.wms.warehouse_management.enums.IOSConstant;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*;
@@ -36,6 +49,24 @@ import java.util.stream.Collectors;
@Service
public class MdMeMaterialbaseServiceImpl extends ServiceImpl<MdMeMaterialbaseMapper, MdMeMaterialbase> implements IMdMeMaterialbaseService {
/**
* 基础分类
*/
@Resource
private IMdPbClassstandardService iMdPbClassstandardService;
/**
* 供应商
*/
@Resource
private IMdCsSupplierbaseService iMdCsSupplierbaseService;
/**
* 计量单位
*/
@Resource
private IMdPbMeasureunitService iMdPbMeasureunitService;
@Override
public IPage<JSONObject> queryAll(Map whereJson, PageQuery page) {
return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()),
@@ -44,7 +75,15 @@ public class MdMeMaterialbaseServiceImpl extends ServiceImpl<MdMeMaterialbaseMap
@Override
@Transactional
@SneakyThrows
public void create(MdMeMaterialbase dto) {
// -------------调用接口进行账户密码进行校验-------------
MobileAuthorizationController bean = SpringContextHolder.getBean(MobileAuthorizationController.class);
AuthUserDto authUserDto = new AuthUserDto();
authUserDto.setUsername(dto.getUsername());
authUserDto.setPassword(dto.getPassword());
bean.loginCheckPc(authUserDto);
// 根据物料编码查询是否有相同物料编码的物料
MdMeMaterialbase mdMeMaterialbase = this.baseMapper.selectOne(
new QueryWrapper<MdMeMaterialbase>().lambda()
@@ -67,7 +106,15 @@ public class MdMeMaterialbaseServiceImpl extends ServiceImpl<MdMeMaterialbaseMap
@Override
@Transactional
@SneakyThrows
public void update(MdMeMaterialbase dto) {
// -------------调用接口进行账户密码进行校验-------------
MobileAuthorizationController bean = SpringContextHolder.getBean(MobileAuthorizationController.class);
AuthUserDto authUserDto = new AuthUserDto();
authUserDto.setUsername(dto.getUsername());
authUserDto.setPassword(dto.getPassword());
bean.loginCheckPc(authUserDto);
MdMeMaterialbase mdMeMaterialbase = this.baseMapper.selectById(dto.getMaterial_id());
if (ObjectUtil.isEmpty(mdMeMaterialbase)) {
throw new BadRequestException("被删除或无权限，操作失败!");
@@ -155,4 +202,42 @@ public class MdMeMaterialbaseServiceImpl extends ServiceImpl<MdMeMaterialbaseMap
}
FileUtil.downloadExcel(list, response);
}
@Override
public List<MdPbClassstandard> getClassList() {
return iMdPbClassstandardService.list(
new QueryWrapper<MdPbClassstandard>().lambda()
.ne(MdPbClassstandard::getParent_class_id, IOSConstant.ZERO)
);
}
@Override
public List<MdCsSupplierbase> getSuppList() {
return iMdCsSupplierbaseService.list(
new QueryWrapper<MdCsSupplierbase>().lambda()
.eq(MdCsSupplierbase::getIs_used, IOSConstant.ONE)
.eq(MdCsSupplierbase::getIs_delete, IOSConstant.ZERO)
);
}
@Override
public List<MdPbMeasureunit> getUnitList() {
return iMdPbMeasureunitService.list(
new QueryWrapper<MdPbMeasureunit>().lambda()
.eq(MdPbMeasureunit::getIs_delete, IOSConstant.ZERO)
.eq(MdPbMeasureunit::getIs_used, IOSConstant.ONE)
);
}
@Override
@SneakyThrows
public void deleteRow(MdMeMaterialbase dto) {
// -------------调用接口进行账户密码进行校验-------------
MobileAuthorizationController bean = SpringContextHolder.getBean(MobileAuthorizationController.class);
AuthUserDto authUserDto = new AuthUserDto();
authUserDto.setUsername(dto.getUsername());
authUserDto.setPassword(dto.getPassword());
bean.loginCheckPc(authUserDto);
this.removeById(dto);
}
}

7
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaPublicInterfaceController.java
View File

@@ -53,4 +53,11 @@ public class PdaPublicInterfaceController {
return new ResponseEntity<>(pdaUpdatePointService.queryRegionDropdown(whereJson), HttpStatus.OK);
}
@PostMapping("/queryClass")
@Log("查询物料类别下拉框")
@SaIgnore
public ResponseEntity<Object> queryClass() {
return new ResponseEntity<>(pdaUpdatePointService.queryClass(), HttpStatus.OK);
}
}

6
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaPublicInterfaceService.java
View File

@@ -43,4 +43,10 @@ public interface PdaPublicInterfaceService {
* @return PdaResponse
*/
PdaResponse querySupp(JSONObject whereJson);
/**
* 查询物料类别下拉框
* @return PdaResponse
*/
PdaResponse queryClass();
}

46
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaPrintServiceImpl.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.SecurityUtils;
@@ -13,6 +14,8 @@ import org.nl.system.service.dict.ISysDictService;
import org.nl.system.service.dict.dao.Dict;
import org.nl.system.service.param.dao.Param;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.nl.system.service.user.ISysUserService;
import org.nl.system.service.user.dao.SysUser;
import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService;
import org.nl.wms.basedata_manage.service.IMdPbClassstandardService;
import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
@@ -57,6 +60,9 @@ public class PdaPrintServiceImpl implements PdaPrintService {
@Autowired
private IMdPdmMaterialcarService iMdPdmMaterialcarService;
@Autowired
private ISysUserService userService;
@Override
public PdaResponse printBag(JSONObject whereJson) {
OutputStream outputStream=null;
@@ -128,6 +134,15 @@ public class PdaPrintServiceImpl implements PdaPrintService {
if (ObjectUtil.isEmpty(storage_conditions)) {
storage_conditions = "";
}
// 复核人
String user_name = whereJson.getString("username");
if (ObjectUtil.isNotEmpty(user_name)) {
SysUser userInfo = userService.getOne(new LambdaQueryWrapper<SysUser>()
.eq(SysUser::getUsername, user_name));
if (ObjectUtil.isNotEmpty(userInfo)) {
user_name = userInfo.getPerson_name();
}
}
// 插入打印记录
if (ObjectUtil.isEmpty(whereJson.getString("id"))) {
MdPdmMaterialcar mdPdmMaterialcar = new MdPdmMaterialcar();
@@ -189,7 +204,7 @@ public class PdaPrintServiceImpl implements PdaPrintService {
"^FO571,772^GFA,629,784,28,:Z64:eJxt0k1r2zAYB/C/MUQX174mIOqvkJCLR7v6q+gTDJdAX2hGVHrfrjuUfZEdphJwL8XnHspQ72E47OJCiPd/7KR7oQJbkn9I1vPoAf403XdmPw//suP/TFkEDq4bn8jLweiuAxKah0tkXPDhxGsM4DmOOa3hVb23Wix+tYajOhv35sTSgVjE6S13v/Ceh1DNyNKyVMs/osAGn2ip4wKo23e0ocmypWVMi+VELLm2YtHlZ5rPintaWiujaCoUC6OXr/Ajl5mqy8XCiSU3PL4PD9Y82Isdl01nUxfaEgf3QOsQTRjfFSYPEpOOpza0FTQ3ubQ0h+fvOP0iMbzfzhDYJ+gPzC1tatH+wOybxJCWrQ2qR2RMtEpsNLF5rc352R3PifIMaBocMcGqdXptD31an8+XkvcyZg5r5EMsWuDjeoPVCX41W7EqgvIF1BA5r2SVO/xssB2JBZVG4g0GWXdpq1xyhvH0aWeR8YhpvMRI8nkEjDc7g3GdzZ2kHpsri+KxM+5yyo/8UdFby+/mQeyamZtZ6DnvnVvTPM1L7KHcE43LYHY23BuDOqRJjT0ziWFXE4FzfX0guejrsS36ejlGcOfwbyv6zkfywpvtta5/A17XxNM=:F8A4\n" +
"^FO428,744^GFA,597,817,43,:Z64:eJyN07Fq3EAQBuBZFmYbRW43WJxeYY7Aoav8KjIB1xvcpAhnCYHUhNR+jHuD7CKQu3uF6DDErUKaK0SSGemSU6pkQYWGD/HPzCpLi58w6hPoEfF6AHejCgKi3QpH8wO4RDZtys9oMFv77+XBRKAPiKkFd196oS/adDECl8iuffhWG4Q8P7ZNhKAbxMQCHIPQdVsZtEwTpnkeQn0l1LfaatAa0UYAPvRCywq1UBtNtOhe1QAzLSZqhQ4SQFWIJJS/Cnko69dMyT/rQjGtZ3rcT7RdUBLawcPg3yqhiqljevsoFFpMJurIPgyhQdtB7i409QtqBsmaes7qwojUzW2B8lNWkKwfz1khka8CZdIW0t2SxnNbn5i+4wng1ZxVaFkzdT3PVWiDK5vJXGumQ1thrHhbNqP3rg9Vnd9lW9kWcNaD2UTc1n3ZEGz3L1onvCCMHJ223j9hvsnS4guMQj/or6YHuFEVQUq7NJx4h2j6N49pM+zQb6QRfpjC+ahyz8MGfpcJzDUP6FczlW39J000XGgx/EXdRExxpnKz/kXjmcp9vVB3pvEiwB+qTktKQvnIX/C7aiD+BeFJuEw=:D211\n" +
"^FO13,730^GB771,0,4^FS\n" +
"^FO716,122^GFA,197,182,7,:Z64:eJwdzi0OAkEMhuF30oSaDWtH7V4BOYKEq+CwSMQGisJwoJWD4hoQPCFBMgG6Y/ok/clXAKEWsVz5Zdq3Scz9VybaUU26TFJkcGZ4c0LjldSgfeFwDp/XVkpD4SZjpBcjgZ4giYVnhSGyOvrtQopH7tfqiWymAncnEi4GS3/C2HWEBww+U+iceV10/hsHJ1w=:E077\n" +
"^FO716,129^GFA,197,182,7,:Z64:eJwdzi0OAkEMhuF30oSaDWtH7V4BOYKEq+CwSMQGisJwoJWD4hoQPCFBMgG6Y/ok/clXAKEWsVz5Zdq3Scz9VybaUU26TFJkcGZ4c0LjldSgfeFwDp/XVkpD4SZjpBcjgZ4giYVnhSGyOvrtQopH7tfqiWymAncnEi4GS3/C2HWEBww+U+iceV10/hsHJ1w=:E077\n" +
"^FO275,692^GFA,417,504,18,:Z64:eJxdkc9Kw0AQxr9loXuJs9cUavIK6S2H0ryK4gsUetCbA0K96et4XPG61CcQWrwWSS8qNLpOdlv/DYQsv3wz+30ZYF8Of2uguH+Zd40mBPmaW92DE3QFKigH09mFtJUtioue3IcAIuUuuxZ2VfWaMAMdXbFiB+1WsUvI8TW0nPTaHchwCT18YD3nSM5B+QvM8JZNGe9SgbNat4OnO9A0EtsiqxumD4bdYD/Hvm1Ap+J7dCBZ5UFnN0D2mwz0p7hPZO6yqpNcHiZp8sbRzKvtTnSJlIFt67FbyKxJJIUBSdck87BpjiUhHkUuGorEjCKhWp5pSlqDxo9sxh7lmg9k3kFvnXji7xQeai1/PGVHw1BL4Fk8vyY/n4hENA3F7ZSSWZRYoc+e9vVDJvhfI3wBxCV+iQ==:2D2D\n" +
"^FO636,658^GFA,277,460,20,:Z64:eJxt0EsKwjAQBuApgbopdBuh6BUCbtz1KlO8QI+QUtClV5qQhZcQzBFcFgR1kvSl7b/I4oN5BSAmIQABvxGwtHTFspnllh56/2Qz+iW3H8cmHXZUK2/NNVOAbEqhI1KwA9NuJqNKB7uIFIMBm4l2FqI3iWRBwSEYBSs7tO1giY79jvgWo9E4w1vVTLXe7GD93GONJljL+6V16e8oHJ78DLpNd+S2K30/uvO9hYz78ettyGh6aUkwoecGtGL1fy2H/zkmCf/8BS5zVgM=:0CCA\n" +
"^FO282,662^GFA,269,323,17,:Z64:eJxdzzEKwzAMQFEFg7uIZM0Qmit49FDIVVRyAfcGhkC69Uw23nuF5ggeM5i0shtaiCbzMB+pCe5l+1gtvU0XEQ22C63OKFA3/5BSK1SKFucYaBQSUWdwV5tBZGiRX84XACEBO4SWXAAGA9UM/GdYKUwZzuI9N1uNStMmMohJzFjLEi0AIUe/EP5wStqQL0DhLuuuw26hsUSVf8oTb9qEdeBGlfiWYYoKAXij0gCQADvYA1RHAHcE8wM+Lk8fYZ8mfQAIF0gB:9E77\n" +
@@ -203,9 +218,9 @@ public class PdaPrintServiceImpl implements PdaPrintService {
"^FO13,284^GB771,0,4^FS\n" +
"^FO716,244^GFA,205,182,7,:Z64:eJw9yDEKwjAUgOH/EWiWgmuH0F6jU6/j6thFGung5g2kV3kg6OYJHLJ1rZMdojUqOH3wQQ7iyXJkUZrErOaRUlX2DlE1vdv8CEaDHY5qL8Hen95EZDd41HS2A7Lq8MHZW2OirWUuictE67SZAm0VVgS2L6woY4vpvZwL5OTlWsCIiYk1cnPQQJEooU64P8WXN7+3M5s=:582F\n" +
"^FO294,244^GFA,285,312,12,:Z64:eJxFzzGOwkAMBdBvWcJNJNoUI7jClqlyHVpKmhWDtqDjBoireLUSdJwgxXS02YoUgeyfZAUjF09jjz0GCkAixjMrIIMDDNR0N1nvrPHJsg+Qf+tXWE/+yE7qaQZPsNPR7ZJMvh32+4jaw+JPhOxOEa7qF2Br2zxQ0hVYHrID2gawptbeKlQdZ3UL9EOLomV6E7xuEzB6meagGfh8wsQh2bcN/xFHy7mEcKZmX0vm2Jtrak+vaOWbJnBP3g0sKukFmftXIX9HO7w8nfLtP1roTko=:BC66\n" +
"^FO645,201^GFA,401,448,16,:Z64:eJw10L9qwkAcwPHvcWCW1KwOwbxCSsGm0Ic5CNilw211EHJFaJc+gvRJHE6EurVvUFIcXDooXRSC6S8x/rbP3e/P/Q6UAzwYztG6hF131FgJDim5M5HYsFw5qpTC2URs+Vk55TPyQef9GuUlf9Tl332cPTa0vmp87YrPzkrm+xvy74tX4hH5+8W1Y31is2j8alQtzU731KHpy91G6k1RZvRCk6i6HEu9z2xKPxwn6ugeo/1W+lnCr195z2xKFUvJjqSeSL+XCcMM/eZ1HTeWxYIdwVFMClFlUSV66bjFQjI3jdGOJ9+8ZyGXfxBAMZBzNS8JhlJ3YBvLXurZE4RoWWEbde5P0Sd40GI98yQHCKWF9JRBnp7MicXt30sOZ2suYdt8iX/sV3Tx:40BB\n" +
"^FO556,165^GFA,393,644,28,:Z64:eJyN0TFKxEAUBuA/BGaaIdsGDOYKzy6CkKskNxiw2UJ0wsLuJTyEN/ANAbfzDJPGWjuLFL5xEyG7uviaCf+XTN68AY6r5pPop2z425j+YytmHtXalIGoTj6hA189g8cbea4C+1dlzKUlut08wlg7fDiJdAYi7ndiRUU07DPkeem9i5EGgftULM/lrRclhtZ9R+nSWAFinYtR4qpoW7FCLGjArHy0rZE+xZJoRqxJUY6V3yFGQMJLk+/bcTI0y//J2rpEIh3Nz2YPfVLbdRKlDGr6+XzvQ59B1nazkQhr5M3bNJfrpziXzFa81xIhk3neyTwfzEUop3nW7r7gsXZ6mriRI891uD6F9BfD0jJTnJg5Y+rMnnJ/cx0bpOcva3R33Q==:1FCC\n" +
"^FO13,161^GB767,0,4^FS\n" +
"^FO645,207^GFA,401,448,16,:Z64:eJw10L9qwkAcwPHvcWCW1KwOwbxCSsGm0Ic5CNilw211EHJFaJc+gvRJHE6EurVvUFIcXDooXRSC6S8x/rbP3e/P/Q6UAzwYztG6hF131FgJDim5M5HYsFw5qpTC2URs+Vk55TPyQef9GuUlf9Tl332cPTa0vmp87YrPzkrm+xvy74tX4hH5+8W1Y31is2j8alQtzU731KHpy91G6k1RZvRCk6i6HEu9z2xKPxwn6ugeo/1W+lnCr195z2xKFUvJjqSeSL+XCcMM/eZ1HTeWxYIdwVFMClFlUSV66bjFQjI3jdGOJ9+8ZyGXfxBAMZBzNS8JhlJ3YBvLXurZE4RoWWEbde5P0Sd40GI98yQHCKWF9JRBnp7MicXt30sOZ2suYdt8iX/sV3Tx:40BB\n" +
"^FO556,177^GFA,393,644,28,:Z64:eJyN0TFKxEAUBuA/BGaaIdsGDOYKzy6CkKskNxiw2UJ0wsLuJTyEN/ANAbfzDJPGWjuLFL5xEyG7uviaCf+XTN68AY6r5pPop2z425j+YytmHtXalIGoTj6hA189g8cbea4C+1dlzKUlut08wlg7fDiJdAYi7ndiRUU07DPkeem9i5EGgftULM/lrRclhtZ9R+nSWAFinYtR4qpoW7FCLGjArHy0rZE+xZJoRqxJUY6V3yFGQMJLk+/bcTI0y//J2rpEIh3Nz2YPfVLbdRKlDGr6+XzvQ59B1nazkQhr5M3bNJfrpziXzFa81xIhk3neyTwfzEUop3nW7r7gsXZ6mriRI891uD6F9BfD0jJTnJg5Y+rMnnJ/cx0bpOcva3R33Q==:1FCC\n" +
"^FO13,167^GB767,0,4^FS\n" +
"^FO630,692^GFA,409,504,18,:Z64:eJxd0T1qwzAUB/C/EESLIq0qKPYV3KnafBVDh64BD10yqASaQzS36AUUupr0CDVkLUVbUzBRZckuoRqE9JPe08cDpuZSL+YpFsTOUocQV5WkIGcwlAtUIA5skM9wG85RilEOIUAI4gqjoJO4sIZYbq1sK2ieo6KsdmCn/lpujqCHKDrLI4T6igl7rAY9CgmWG+qT7KtRpAc3taWnV3DVTHnk9yfog4jiJuFVB9pqLH/stSiF5UuW1vFqACsMeJlOV7UT6w7szkAXScpgpY9RHiguSQoGEaPKpoDcJ5EiSofN/Tn+VBKmk+Aj/qPJ7zIQt+8WEVH5WdphHADB/72iA3mzLPgcVVuQI8jWUd/k+1wwCn3qgT5Vp4xnxJ10LFk/1SsJyfK/NfgFXTB3tw==:11DA\n" +
"^FO607,288^GB0,259,4^FS\n" +
"^FO199,288^GB0,261,4^FS\n" +
@@ -220,8 +235,8 @@ public class PdaPrintServiceImpl implements PdaPrintService {
"^FO64,511^GFA,301,324,12,:Z64:eJxF0LFqwzAQxvG/MFhLKq8ZRP0KGV0amlfRI3gMpC3K0uc68Bo6d1TIkKWDuhla6p6ioQdCPz5OoDsoFbrc3oBsgpm31SkFthmeYPyaAr0EdhE5vCXsUejExN6rp0gjDW44x/YKJln8eMHpQ7LDpyv+Wb33PMg7/Yd6WHOIJ73VfuBx0XCtdiP2e6ab1e2I22RcyZvEfcisik3Ci559sXAnv/RztVk096VfaH4E/xLV0SwIu6nkkaxeWbWNZeLbgMVW3X3WHhuFV1/3YI+p/rNuRefgvzT/A0TbSR0=:0A13\n" +
"^FO52,474^GFA,217,272,16,:Z64:eJxjYz9gYcDf2HjAjo2xgYGBgU0mwaLA4mDjgcdQvoSBRYVBYuOBg80QPoNBTgVDYnMCI4wvkXODwbA5geFgI4x/Bplv/yPtTP3HNsP/Bw6C+QYSx84kGLYZNkD4fBIGx3sMEtsMDjb+h/HbDBJ7JA42g/XL8SQ2t0kc7JFIhrinjP1gMxt/Y48E1L0IgI8PYqLzmdHUM4LtBwBRqT1Z:F006\n" +
"^FT560,424^A1I,23,25^FH\\^CI28^FD"+qty+"^FS^CI27\n" +
"^FO13,105^GB769,0,4^FS\n" +
"^BY3,3,58^FT571,39^BCI,,Y,N\n" +
"^FO13,114^GB769,0,4^FS\n" +
"^BY3,3,58^FT571,47^BCI,,Y,N\n" +
"^FH\\^FD>:"+bag_code+"^FS\n" +
"^FT763,424^A1I,23,25^FH\\^CI28^FD"+data+"^FS^CI27\n" +
"^FT426,749^A1I,23,25^FH\\^CI28^FD"+pcsn+"^FS^CI27\n" +
@@ -235,14 +250,16 @@ public class PdaPrintServiceImpl implements PdaPrintService {
"^FO597,242^GFA,221,299,13,:Z64:eJxVz7ENwyAQheGzLEFDcHuST3gF0pFtGIEJEke0GcqeICuQDVymzB2JY5uKT0JPPwD/c4XdUXu0RwxlGOd7Pr37ootL54nRPZwnTyFGhjWEHhErjEJMBhEq+BItEvgVCs1tEQTEiRGTrJWK3wAw9AojoJCKgAQuXaRA1YGe256v3C51gHObsdbHAyyjmXMWcNsGrt6ekRd03+/r8gG6xUAF:67FA\n" +
"^FO144,242^GFA,253,460,20,:Z64:eJyV0E0KwjAQBeApha6i3Q40tFeIKyMUvcp4g4AHsJKth0pP0CvEG3Tp0kn6Q4siOpDNB3kvE4B5FLzP31b5qmlvdvMs/MkRVY6tNDvHlt9LVXsibdikJmLbConaEFEIQIwmMkSliBxGg2hiaRLUZHoyce2DaTacjUzo9UsbO2DVQYsOH01q44NJ5PedByvNIeyRcUftL8PdgvftHjbtEffuOObxSZp0+pJvlrTW/mIf83JY2wtDdVd3:C1C1\n" +
"^FO111,247^GFA,33,64,4,:Z64:eJyz/9/AYMBIHrYH6gUArdcNKw==:8BD1\n" +
"^FO587,124^GFA,237,285,15,:Z64:eJx9zjEOgkAQBdAxmyzNZG2/CZErUG7lWXZvwAkMhsJDeBiHUNh5hqWxho6CwkG0sGG6l5+ZP0RmEIl3Y22WEoicTxLHxlqugpI5SGyVQIUjMZUS625h+eNFU4IHk6PDlwzdNVJIvOrlYs6VVDmJsxI5LwRLXy/ESkivuw7YT9qLsu2bxrnce00tQpce5nZyn6/MkJ7hvBtfWQraqyO0TtCvtkgb9P8spjeReTug:A02F\n" +
"^FO587,131^GFA,237,285,15,:Z64:eJx9zjEOgkAQBdAxmyzNZG2/CZErUG7lWXZvwAkMhsJDeBiHUNh5hqWxho6CwkG0sGG6l5+ZP0RmEIl3Y22WEoicTxLHxlqugpI5SGyVQIUjMZUS625h+eNFU4IHk6PDlwzdNVJIvOrlYs6VVDmJsxI5LwRLXy/ESkivuw7YT9qLsu2bxrnce00tQpce5nZyn6/MkJ7hvBtfWQraqyO0TtCvtkgb9P8spjeReTug:A02F\n" +
"^FT530,623^A1I,23,25^FH\\^CI28^FD"+supp_name+"^FS^CI27\n" +
"^FT499,572^A1I,23,25^FH\\^CI28^FD"+produce_name+"^FS^CI27\n" +
"^FT629,665^A1I,23,25^FH\\^CI28^FD"+validity_period+"^FS^CI27\n" +
"^FT639,207^A1I,23,25^FH\\^CI28^FD"+storage_conditions+"^FS^CI27\n" +
"^FT639,213^A1I,23,25^FH\\^CI28^FD"+storage_conditions+"^FS^CI27\n" +
"^FT464,865^A1I,23,25^FH\\^CI28^FD"+material_code+"^FS^CI27\n" +
"^FT370,437^A1I,20,20^FH\\^CI28^FD"+create_name+"^FS^CI27\n" +
"^FT389,413^A1I,20,20^FH\\^CI28^FD"+data+"^FS^CI27\n" +
"^FT170,437^A1I,20,20^FH\\^CI28^FD"+user_name+"^FS^CI27\n" +
"^FT188,413^A1I,20,20^FH\\^CI28^FD"+data+"^FS^CI27\n" +
"^PQ1,0,1,Y\n" +
"^XZ\n";
} else {
@@ -334,6 +351,8 @@ public class PdaPrintServiceImpl implements PdaPrintService {
"^FT152,640^A1I,23,25^FH\\^CI28^FD"+qty+"^FS^CI27\n" +
"^FT469,856^A1I,23,25^FH\\^CI28^FD"+material_code+"^FS^CI27\n" +
"^FT548,335^A1I,23,25^FH\\^CI28^FD"+create_name+data+"^FS^CI27\n" +
"^FT544,275^A1I,23,25^FH\\^CI28^FD"+user_name+data+"^FS^CI27\n" +
"^FT454,580^A1I,23,25^FH\\^CI28^FD"+data+"^FS^CI27\n" +
"^PQ1,0,1,Y\n" +
"^XZ\n";
}
@@ -390,6 +409,15 @@ public class PdaPrintServiceImpl implements PdaPrintService {
String qty = NumberUtil.round(row.getString("bucket_weight"), 3).toString()+"KG";
// 桶号
String bucket_code = row.getString("bucket_code");
// 复核人
String user_name = whereJson.getString("username");
if (ObjectUtil.isNotEmpty(user_name)) {
SysUser userInfo = userService.getOne(new LambdaQueryWrapper<SysUser>()
.eq(SysUser::getUsername, user_name));
if (ObjectUtil.isNotEmpty(userInfo)) {
user_name = userInfo.getPerson_name() + DateUtil.today();
}
}
// 插入打印记录
if (ObjectUtil.isEmpty(whereJson.getString("id"))) {
MdPdmMaterialcar mdPdmMaterialcar = new MdPdmMaterialcar();
@@ -494,6 +522,8 @@ public class PdaPrintServiceImpl implements PdaPrintService {
"^FO259,388^GFA,269,330,15,:Z64:eJyTb2AAgToGCCh4ACIZD0NEGRISwNxGKPcAmCvNCJM9ACIlm6F67cHCEv+gXMbD/Tb2DQbsfDYf/vAf+Md4mE0iEcjlkUg4w3OwjZ+ZTeIAQ4INj0Rim0Qy0BAwNw3KNTgM5h7mkUhutyiGcg8gcx/AuQ0/Ds+3KWZsfsxX87ndovAMf+P3H/aMDXbs9x+3WxT8ATmFmRlMArk8OLmMbRIJEC4bmHtO5gGYWw/mMgDdDDaKASzIUMEODQMeBhgAAMOSRSk=:5649\n" +
"^FT465,856^A1I,23,25^FH\\^CI28^FD"+material_code+"^FS^CI27\n" +
"^FT544,335^A1I,23,25^FH\\^CI28^FD"+create_name+"^FS^CI27\n" +
"^FT544,275^A1I,23,25^FH\\^CI28^FD"+user_name+"^FS^CI27\n" +
"^FT450,580^A1I,23,25^FH\\^CI28^FD"+DateUtil.today()+"^FS^CI27\n" +
"^PQ1,0,1,Y\n" +
"^XZ\n";
byte[] zplBytes = zplContent.getBytes(StandardCharsets.UTF_8);

25
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaUpdatePointServiceImpl.java
View File

@@ -5,7 +5,9 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.nl.wms.basedata_manage.service.IMdCsSupplierbaseService;
import org.nl.wms.basedata_manage.service.IMdPbClassstandardService;
import org.nl.wms.basedata_manage.service.dao.MdCsSupplierbase;
import org.nl.wms.basedata_manage.service.dao.MdPbClassstandard;
import org.nl.wms.basedata_manage.service.dao.mapper.MdMeMaterialbaseMapper;
import org.nl.wms.pda.general_management.service.PdaPublicInterfaceService;
import org.nl.wms.pda.util.PdaResponse;
@@ -15,6 +17,7 @@ import org.nl.wms.warehouse_management.enums.IOSConstant;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -47,6 +50,12 @@ public class PdaUpdatePointServiceImpl implements PdaPublicInterfaceService {
@Resource
private IMdCsSupplierbaseService iMdCsSupplierbaseService;
/**
* 基础分类
*/
@Resource
private IMdPbClassstandardService iMdPbClassstandardService;
@Override
public PdaResponse queryMaterInfo(JSONObject whereJson) {
return PdaResponse.requestParamOk(mdMeMaterialbaseMapper.queryPdaMaterInfo(whereJson));
@@ -82,4 +91,20 @@ public class PdaUpdatePointServiceImpl implements PdaPublicInterfaceService {
}
return PdaResponse.requestParamOk(iMdCsSupplierbaseService.list(lambda));
}
@Override
public PdaResponse queryClass() {
List<MdPbClassstandard> list = iMdPbClassstandardService.list(
new QueryWrapper<MdPbClassstandard>().lambda()
.ne(MdPbClassstandard::getParent_class_id, IOSConstant.ZERO)
);
List<JSONObject> resultList = new ArrayList<>();
list.forEach(row -> {
JSONObject json = new JSONObject();
json.put("text", row.getClass_name());
json.put("value", row.getClass_code());
resultList.add(json);
});
return PdaResponse.requestParamOk(resultList);
}
}

15
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingDownTask.java
View File

@@ -48,6 +48,21 @@ public class PalletizingDownTask extends AbstractTask {
if (list.size() == 0) {
throw new BadRequestException("物料通道被占用！");
}
// 判断载具缓存点是否有空托盘
SchBasePoint pointDao = pointService.getById("QFCC08");
if (!pointDao.getPoint_status().equals(IOSConstant.THREE)) {
throw new BadRequestException("空载具缓存位没有空托盘！");
}
// 盘点是否有任务
List<SchBaseTask> taskList = taskService.list(
new QueryWrapper<SchBaseTask>().lambda()
.eq(SchBaseTask::getPoint_code1, "QFCC08")
.eq(SchBaseTask::getIs_delete, IOSConstant.ZERO)
.lt(SchBaseTask::getTask_status, TaskStatus.FINISHED.getCode())
);
if (ObjectUtil.isNotEmpty(taskList)) {
throw new BadRequestException("空载具缓存位没有空托盘！");
}
SchBasePoint point = list.get(0);
SchBaseTask task = new SchBaseTask();
task.setTask_id(IdUtil.getStringId());