dshuj"

pom.xml

@@ -161,16 +161,12 @@
             <version>1.7.21</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.41</version>
-        </dependency>
 
     </dependencies>
     <build>
         <plugins>
             <!--             自动生成代码文件 -->
+<<<<<<< HEAD
 <!--            <plugin>-->
 <!--                <groupId>com.steerinfo</groupId>-->
 <!--                <artifactId>generator-maven-plugin</artifactId>-->
@@ -194,6 +190,31 @@
 <!--                    </execution>-->
 <!--                </executions>-->
 <!--            </plugin>-->
+=======
+            <plugin>
+                <groupId>com.steerinfo</groupId>
+                <artifactId>generator-maven-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
+                    <user>dil</user>
+                    <password>Dil123789</password>
+                    <!--包名-->
+                    <targetPackage>com.steerinfo.dil</targetPackage>
+                    <tables>
+                        <table></table>
+                    </tables>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>steerinfo</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+>>>>>>> 513e47be307d0cb1ce7dbbbb30ed768eaa3329b4
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMapper.java

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal> {
@@ -15,4 +16,8 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
     // 得到销售订单下的所有车序号
     List<Map<String, Object>> getTruckNo(BigDecimal saleOrderId);
+
+    // 得到销售订单主键
+    @Select("")
+    BigDecimal getSaleOrderId();
 }

src/main/java/com/steerinfo/dil/service/impl/AmsPurchaseOrderServiceImpl.java

@@ -109,7 +109,7 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         amsPurchaseOrder.setPuchaseOrderMaterialNumber(new BigDecimal(purchaseOrderMaterialNumber));
         amsPurchaseOrder.setBatchId(batchId);
         amsPurchaseOrder.setSupplierUnitId(supplierId);
-        amsPurchaseOrder.setReceiveUnitId(shipperId);
+        amsPurchaseOrder.setReceiveUnitId(purchasingOrganizationId);
         amsPurchaseOrder.setPurchasingOrganizationId(purchasingOrganizationId);
         amsPurchaseOrder.setEasPurchaseOrderId(EASPurchaseId);
         amsPurchaseOrder.setInsertTime(new Date());

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -6,6 +6,7 @@ import com.steerinfo.dil.service.IAmsSaleOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -61,6 +62,17 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         Map<String,Object> map = new HashMap<>();
         map.put("saleNumber",saleNumber);
         List<AmsSaleOrder> amsSaleOrders = amsSaleOrderMapper.selectByParameters(map);
+        if (amsSaleOrders.size() == 0) {
+            AmsSaleOrder amsSaleOrder = new AmsSaleOrder();
+            amsSaleOrder.setSaleOrderId(amsSaleOrderMapper.getSaleOrderId());
+            amsSaleOrder.setSaleNumber(saleNumber);
+            amsSaleOrder.setDeleted(new BigDecimal(0));
+            amsSaleOrder.setInsertTime(new Date());
+            amsSaleOrder.setUpdateTime(new Date());
+            amsSaleOrder.setInsertUsername("admin");
+            amsSaleOrder.setInsertUpdateRemark("金蝶采集销售订单");
+            amsSaleOrder.setUpdateUsername("admin");
+        }
         AmsSaleOrder amsSaleOrder = amsSaleOrders.get(0);
         amsSaleOrder.setSaleNumber(saleNumber);
         amsSaleOrder.setSaleAccountBalance(new BigDecimal(saleAccountBalance));

src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -610,25 +610,16 @@
 
     <!-- 得到销售订单信息 -->
     <select id="getSaleOrderMessage" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT ASO.SALE_NUMBER           AS "saleNumber",
-               RC.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName",
-               ASO.INSERT_TIME           AS "saleTime",
-               RS.SHIPPER_NAME           AS "shipperName",
-               RM.MATERIAL_CODE          AS "materialCode",
-               RM.MATERIAL_NAME          AS "materialName",
-               RUOM.UNIT_OF_MEASURE_NAME AS "unitOfMeasureName",
-               ASP.PLAN_MATERIAL_NUMBER  AS "planMaterialNumber"
+        SELECT ASO.SALE_NUMBER           AS "number",
+               RC.CONSIGNEE_CODE AS "cusNum",
+                ASO.INSERT_TIME AS "bizDate"
+
         FROM AMS_SALE_ORDER ASO
                  LEFT JOIN RMS_CONSIGNEE RC
                            ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
                  LEFT JOIN AMS_SALE_PLAN ASP
                            ON ASP.PLAN_ID = ASO.PLAN_ID
-                 LEFT JOIN RMS_MATERIAL RM
-                           ON ASP.MATERIAL_ID = RM.MATERIAL_ID
-                 LEFT JOIN RMS_SHIPPER RS
-                           ON RS.SHIPPER_ID = ASO.SHIPPER_ID
-                 LEFT JOIN RMS_UNIT_OF_MEASURE RUOM
-                           ON RUOM.UNIT_OF_MEASURE_ID = RM.UNIT_OF_MEASURE_ID
+
     </select>
 
     <!-- 得到订单下的车序号 -->