rev：测试修改

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java

@@ -183,8 +183,10 @@ public class PdaCommonServiceImpl implements PdaCommonService {
     }
 
     @Override
+    @Transactional
     public PdaResponse confirmPalletAssembly(AssemblyPalletParam param) {
         // 判断此载具状态
+
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("vehicle_code", param.getVehicle_code());
         groupplateService.checkVehicle(jsonObject);
@@ -287,8 +289,13 @@ public class PdaCommonServiceImpl implements PdaCommonService {
             throw new BadRequestException("当前点位不存在【" + whereJson.getString("point_code") + "】");
         }
 
-        // 计算叠盘位是否还能继续叠盘
         JSONObject row = whereJson.getJSONObject("row");
+        // 判断起点和终点不能相同
+        if (startPointDao.getPoint_code().equals(row.getString("point_code"))) {
+            throw new BadRequestException("起点和终点不能相同!");
+        }
+
+        // 计算叠盘位是否还能继续叠盘
         if (row.getIntValue("remaining_qty") == 0) {
             throw new BadRequestException("当前堆叠位空托盘数量已满【" + row.getString("point_code") + "】");
         }

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml

@@ -238,9 +238,9 @@
             LEFT JOIN md_cs_supplierbase s ON s.supp_code = mg.supp_code
         WHERE
             mg.status = '0'
-        <if test="param.bag_code != null and param.bag_code != ''">
+        <if test="param.bag_no != null and param.bag_no != ''">
             AND
-            mg.bag_code = #{param.bag_code}
+            mg.bag_code = #{param.bag_no}
         </if>
     </select>
 </mapper>

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java

@@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -76,6 +77,12 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl<MdPbGroupplateMapper,
     @Autowired
     private IMdPbClassstandardService iMdPbClassstandardService;
 
+    /**
+     * 仓位服务
+     */
+    @Resource
+    private IStructattrService iStructattrService;
+
     @Override
     public IPage<JSONObject> queryAll(Map whereJson, PageQuery page) {
         return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()),
@@ -155,6 +162,13 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl<MdPbGroupplateMapper,
         if (ObjectUtil.isEmpty(vehicleDao)) {
             throw new BadRequestException("此载具不存在【" + whereJson.getString("vehicle_code") + "】");
         }
+        //判断该载具编号是否已经存在库内
+        List<Structattr> vehicleList = iStructattrService.list(new LambdaQueryWrapper<>(Structattr.class)
+                .eq(Structattr::getStoragevehicle_code, whereJson.get("vehicle_code")));
+        if (ObjectUtil.isNotEmpty(vehicleList)) {
+                throw new BadRequestException("载具编码：" + whereJson.getString("vehicle_code") + "已存在库内，请对数据进行核实！");
+        }
+
         // 校验此载具下的组盘信息是否有入库或者出库的信息
         List<JSONObject> groupList = this.baseMapper.queryVehicleGroupInfo(whereJson);
         boolean is_all = groupList.stream()