优化erp同步成品入库

易文鹏
1 parent 42f8ecfe
Showing 3 changed files with 21 additions and 13 deletions
src/main/java/com/huaheng/api/general/controller/BasicDataApiController.java
src/main/java/com/huaheng/api/general/service/BarCodeApiService.java
src/main/resources/templates/shipment/shipmentDetail/add.html
@@ -36,6 +36,7 @@ import com.huaheng.pc.system.user.domain.User;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
  
 import javax.annotation.Resource;
@@ -7,6 +7,7 @@ import com.huaheng.api.general.domain.BarCodeDomain;
 import com.huaheng.api.wcs.service.taskInfo.TaskInfoService;
 import com.huaheng.common.constant.QuantityConstant;
 import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.utils.spring.SpringUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.barcode.barcodeDetail.domain.BarCodeDetail;
 import com.huaheng.pc.barcode.barcodeDetail.service.BarCodeDetailService;
@@ -95,7 +96,7 @@ public class BarCodeApiService {
  
  
  
-
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult addBarCodeApi(BarCodeDomain barCodeDomain){
         AjaxResult ajaxResult = checkBarCode(barCodeDomain);
         if(ajaxResult.getCode()!=200){
@@ -129,6 +130,9 @@ public class BarCodeApiService {
                 LambdaQueryWrapper<Material> materialLambdaQueryWrapper = Wrappers.lambdaQuery();
                  materialLambdaQueryWrapper.eq(Material::getCode,barCodeDetail.getMaterialCode());
                 Material materialServiceOne = materialService.getOne(materialLambdaQueryWrapper);
+                if(StringUtils.isNotEmpty(materialServiceOne.getName())){
+                    return AjaxResult.error("物料信息不一致");
+                }
                 String materialName = materialServiceOne.getName();
                 barCodeDetail.setMaterialName(materialName);
             }
@@ -42,6 +42,18 @@
 <!--				</div>-->
 <!--			</div>-->
 			<div class="form-group">
+				<label class="col-sm-3 control-label">订单号 ：</label>
+				<div class="col-sm-8">
+					<input id="orderNo" name="orderNo" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">电池包编码：</label>
+				<div class="col-sm-8">
+					<input id="batteryPageCode" name="batteryPageCode" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">
 				<label class="col-sm-3 control-label">磅单编码：</label>
 				<div class="col-sm-8">
 					<input id="poundNumber" name="poundNumber" class="form-control" type="text"  th:value="${poundNumber}" readonly="readonly">
@@ -65,6 +77,7 @@
 					<input id="netWeight" name="netWeight" class="form-control" th:value="${netWeight}" type="text" readonly="readonly">
 				</div>
 			</div>
+
 		<div class="form-group">
 			<label class="col-sm-3 control-label">库存状态：</label>
 			<div class="col-sm-8">
@@ -86,12 +99,7 @@
 <!--					<input id="electricQuantity" name="electricQuantity" class="form-control" type="text">-->
 <!--				</div>-->
 <!--			</div>-->
-		<div class="form-group">
-			<label class="col-sm-3 control-label">订单号 ：</label>
-			<div class="col-sm-8">
-				<input id="orderNo" name="orderNo" class="form-control" type="text">
-			</div>
-		</div>
+
 		<div class="form-group">
 			<label class="col-sm-3 control-label">出库口：</label>
 			<div class="col-sm-8">
@@ -238,12 +246,7 @@
 					<input id="batteryQty" name="batteryQty" class="form-control" type="text">
 				</div>
 			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">电池包编码：</label>
-				<div class="col-sm-8">
-					<input id="batteryPageCode" name="batteryPageCode" class="form-control" type="text">
-				</div>
-			</div>
+
  
  
 			<div class="form-group">